From 88e11a960fb7287c3c5f542cd5199cc899f137f2 Mon Sep 17 00:00:00 2001
From: Eugene Crosser <crosser@average.org>
Date: Sun, 1 Dec 2013 18:50:48 +0400
Subject: [PATCH] change serialization interface

---
 serial.c      | 10 ++++++----
 serial.h      |  2 +-
 test_serial.c | 14 +++++---------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/serial.c b/serial.c
index 809ea7c..d773440 100644
--- a/serial.c
+++ b/serial.c
@@ -20,6 +20,7 @@ void serial_switch(serializer_t *srl, void *buffer, int size)
 	srl->cursor = buffer + used;
 }
 
+/* returns 'size' on success, or remainging space if it was insufficient */
 int serial_put(serializer_t *srl, const void *item, int size)
 {
 	int left = srl->bufsize - (srl->cursor - srl->buffer);
@@ -32,17 +33,18 @@ int serial_put(serializer_t *srl, const void *item, int size)
 	return size;
 }
 
-int serial_get(serializer_t *srl, void *item, int bufsize)
+/* return 0 on success, -1 on wrong encoding (item longer than space left) */
+int serial_get(serializer_t *srl, void **item, int *size)
 {
 	int left = srl->bufsize - (srl->cursor - srl->buffer);
 	short isize = *((short *)srl->cursor);
 
-	if (isize > bufsize) return isize;
 	if (isize + sizeof(short) > left) return -1;
 	srl->cursor += sizeof(short);
-	if (isize) memcpy(item, srl->cursor, isize);
+	*item = srl->cursor;
+	*size = isize;
 	srl->cursor += isize;
-	return isize;
+	return 0;
 }
 
 int serial_size(serializer_t *srl)
diff --git a/serial.h b/serial.h
index 9cda40c..969c15f 100644
--- a/serial.h
+++ b/serial.h
@@ -10,7 +10,7 @@ typedef struct _serializer {
 void serial_init(serializer_t *srl, void *buffer, int size);
 void serial_switch(serializer_t *srl, void *buffer, int size);
 int serial_put(serializer_t *srl, const void *item, int size);
-int serial_get(serializer_t *srl, void *item, int bufsize);
+int serial_get(serializer_t *srl, void **item, int *size);
 int serial_size(serializer_t *srl);
 
 #endif
diff --git a/test_serial.c b/test_serial.c
index c2a59e6..32e3ed3 100644
--- a/test_serial.c
+++ b/test_serial.c
@@ -30,17 +30,13 @@ int main(int argc, char *argv[])
 	printf("serialized size=%d\n", serial_size(&srl));
 	serial_init(&srl, buffer, sizeof(buffer));
 	for (i = 0; i < 4; i++) {
-		char item[32];
-		memset(item, 0, sizeof(item));
-		int size = serial_get(&srl, item, sizeof(item));
-		if (size > sizeof(item)) {
-			printf("serial_get(..., item, %d) = %d\n",
-				(int)sizeof(item), size);
+		char *item;
+		int size;
+		if (serial_get(&srl, (void**)&item, &size)) {
+			printf("serial_get failed for item %d\n", i);
 			rc = 1;
-		} else if (size == 0) {
-			printf("serial_get(...) = 0\n");
 		} else {
-			printf("serial_get(...) = %d: \"%s\"\n", size, item);
+			printf("serial_get(...) = %d: \"%.*s\"\n", size, size, item);
 			if (memcmp(in[i], item, size)) {
 				printf("\"%s\" != \"%s\" (%d)\n",
 					in[i], item, size);
-- 
2.39.2