change serialization interface

diff --git a/serial.c b/serial.c
index 809ea7ce108a41e0d0e942ce58980291870ea6b8..d773440df4c3d35d473f0ad6a77f078b9e0cd74e 100644 (file)
--- a/serial.c
+++ b/serial.c
@@ -20,6 +20,7 @@ void serial_switch(serializer_t *srl, void *buffer, int size)
        srl->cursor = buffer + used;
 }
 
        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);
 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;
 }
 
        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);
 
 {
        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 + sizeof(short) > left) return -1;
        srl->cursor += sizeof(short);

-       if (isize) memcpy(item, srl->cursor, isize);
+       *item = srl->cursor;
+       *size = isize;

        srl->cursor += isize;
        srl->cursor += isize;

-       return isize;
+       return 0;

 }
 
 int serial_size(serializer_t *srl)
 }
 
 int serial_size(serializer_t *srl)

diff --git a/serial.h b/serial.h
index 9cda40c66b6ec03d17a364d6d5a91b022c9cb4c2..969c15f3904f239b272ec34e90f354bc20e4db76 100644 (file)
--- 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);
 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
 int serial_size(serializer_t *srl);
 
 #endif

diff --git a/test_serial.c b/test_serial.c
index c2a59e60171fe77cc3a9cdc3d8b7557e277dce13..32e3ed3af15b23b0338ee9547a0c0daa4fe3b953 100644 (file)
--- 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++) {
        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;
                        rc = 1;

-               } else if (size == 0) {
-                       printf("serial_get(...) = 0\n");

                } else {
                } 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);
                        if (memcmp(in[i], item, size)) {
                                printf("\"%s\" != \"%s\" (%d)\n",
                                        in[i], item, size);