refactor

1 files changed, 14 insertions, 6 deletions

diff --git a/protocol.h b/protocol.h
index 0978f00..9d6f509 100644
--- a/protocol.h
+++ b/protocol.h
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <errno.h>
 
+#define PROTOCOL_VERSION 0
+
 // MARK: - Helpers
 #if defined(__APPLE__)
 #include <libkern/OSByteOrder.h>
@@ -40,14 +42,20 @@
 
 #define pos_bufferx(x, y) ((x + y))
 #define pos_buffer(x) pos_bufferx(x, counter)
-#define check_addx(func, x)  \
-{                           \
+/*#define check_addx(func, x)  \
     if (func < 0)           \
         return func;        \
-    x += func;              \
-}
+    x += func;*/
 #define check_add(func) check_addx(func, counter)
 
+int inline check_addx(int func, int *x)
+{
+    if (func < 0)
+        return func;
+    *x += func;
+    return 0;
+}
+
 
 // MARK: - READ
 // MARK: VAR
@@ -83,7 +91,7 @@ typedef struct {
 int read_position(position_t *dest, uint8_t *src);
 
 // string
-int read_string_malloc(char *str, uint8_t *src);
+int read_string_malloc(char *dest, uint8_t *src);
 
 // MARK: - WRITE
 // MARK: VAR
@@ -93,6 +101,6 @@ int write_var_long(long value, uint8_t *dest);
 // MARK: primitives
 
 // string
-int write_string(char *str, uint8_t *dest, int size);
+int write_string(const char *str, uint8_t *dest, int size);
 
 #endif /* protocol_h */