1 files changed, 16 insertions, 16 deletions

diff --git a/src/common/protocol.c b/src/common/protocol.c
index 0ffaede..54d51f6 100644
--- a/src/common/protocol.c
+++ b/src/common/protocol.c
@@ -31,7 +31,7 @@
 #include "protocol_private.h"
 #include "net.h"
 
-#define READ_AS(from, type)	(*(type*)(from))
+#define READ_AS(type, from)	(*((type*)(from)))
 
 int push_data(cd_t connection, const char *data, enum tlv_type type)
 {
@@ -59,7 +59,7 @@ int push_data(cd_t connection, const char *data, enum tlv_type type)
 	return ret;
 }
 
-static int push_string(cd_t connection, char *str)
+static int push_string(cd_t connection, const char *str)
 {
 	int ret = 0;
 	size_t size = strlen(str);
@@ -69,25 +69,25 @@ static int push_string(cd_t connection, char *str)
 	return ret;
 }
 
-static int push_fpi1(cd_t connection, char *num)
+static int push_fpi1(cd_t connection, const char *num)
 {
 	return		push_tlv_header(connection, FPI1, sizeof(fpi1_t))
 		|	push_bytes(connection, num, sizeof(fpi1_t));
 }
 
-static int push_timestamp(cd_t connection, char *data)
+static int push_timestamp(cd_t connection, const char *data)
 {
 	return		push_tlv_header(connection, TIMESTAMP, sizeof(time_t))
 		|	push_bytes(connection, data, sizeof(time_t));
 }
 
-static int push_request(cd_t connection, char *data)
+static int push_request(cd_t connection, const char *data)
 {
-	return          push_tlv_header(connection, REQUEST, sizeof(msg_idx_t))
-		|       push_bytes(connection, data, sizeof(msg_idx_t));
+	return		push_tlv_header(connection, REQUEST, sizeof(msg_idx_t))
+		|	push_bytes(connection, data, sizeof(msg_idx_t));
 }
 
-static int push_reply(cd_t connection, char *data)
+static int push_reply(cd_t connection, const char *data)
 {
 	int ret = 0;
 	size_t msglen = strlen(data + sizeof(msg_idx_t));
@@ -96,7 +96,7 @@ static int push_reply(cd_t connection, char *data)
 	return ret;
 }
 
-static int push_uuid(cd_t connection, char *data)
+static int push_uuid(cd_t connection, const char *data)
 {
 	return		push_tlv_header(connection, UUID, sizeof(uuid_t))
 		|	push_bytes(connection, data, sizeof(uuid_t));
@@ -110,7 +110,7 @@ size_t tlv_count(const struct packet_data * const packet)
 
 	while (cursor < packet->packet_size) {
 		cursor += sizeof(enum tlv_type);
-		length = READ_AS(packet->data + cursor, enum tlv_type);
+		length = READ_AS(enum tlv_type, packet->data + cursor);
 		cursor += sizeof(size_t) + length;
 		ret++;
 	}
@@ -120,8 +120,8 @@ size_t tlv_count(const struct packet_data * const packet)
 	return ret;
 }
 
-size_t get_tlvs(        const struct packet_data * const data,
-			const struct tlv *buf,
+size_t get_tlvs(	const struct packet_data * const data,
+			struct tlv *buf,
 			size_t buf_size)
 {
 	size_t tlvs_read = 0;
@@ -139,13 +139,13 @@ size_t get_tlvs(        const struct packet_data * const data,
 	return tlvs_read;
 }
 
-size_t parse_tlv(char *data, size_t cursor, struct tlv *t)
+size_t parse_tlv(const char *data, size_t cursor, struct tlv *t)
 {
-	char *begin = data + cursor;
+	const char *begin = data + cursor;
 
-	t->type = READ_TLV_TYPE(data + cursor);
+	t->type = READ_AS(enum tlv_type, data + cursor);
 	cursor += sizeof(enum tlv_type);
-	t->length += READ_SIZE_T(data + cursor);
+	t->length += READ_AS(enum tlv_type ,data + cursor);
 	data += sizeof(size_t);
 	t->data = data + cursor;