X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=serial.c;h=d773440df4c3d35d473f0ad6a77f078b9e0cd74e;hp=1aad7a10350058b2f8e35b46f99a9b78d6863fec;hb=dc8959a3cb5615448ea9307a3277e608ffd8a6dd;hpb=8e164eeff8c7d7f08b473d37ebb01093f574d6a2

diff --git a/serial.c b/serial.c
index 1aad7a1..d773440 100644
--- a/serial.c
+++ b/serial.c
@@ -4,14 +4,13 @@
 #include <string.h>
 #include "serial.h"
 
-int serial_init(serializer_t *srl, void *buffer, int size)
+void serial_init(serializer_t *srl, void *buffer, int size)
 {
 	srl->buffer = srl->cursor = buffer;
 	srl->bufsize = size;
-	return 0;
 }
 
-int serial_switch(serializer_t *srl, void *buffer, int size)
+void serial_switch(serializer_t *srl, void *buffer, int size)
 {
 	int used = srl->cursor - srl->buffer;
 
@@ -19,28 +18,33 @@ int serial_switch(serializer_t *srl, void *buffer, int size)
 	srl->buffer = buffer;
 	srl->bufsize = size;
 	srl->cursor = buffer + used;
-	return 0;
 }
 
+/* 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);
+
 	if (left < size + sizeof(short)) return left - sizeof(short);
 	*((short *)srl->cursor) = size;
-	srl->cursor += 2;
+	srl->cursor += sizeof(short);
 	if (size) memcpy(srl->cursor, item, size);
 	srl->cursor += 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 || isize == 0) return isize;
+
+	if (isize + sizeof(short) > left) return -1;
 	srl->cursor += sizeof(short);
-	memcpy(item, srl->cursor, isize);
+	*item = srl->cursor;
+	*size = isize;
 	srl->cursor += isize;
-	return isize;
+	return 0;
 }
 
 int serial_size(serializer_t *srl)