19July06

[bacula/bacula] / bacula / src / lib / serial.c

diff --git a/bacula/src/lib/serial.c b/bacula/src/lib/serial.c
index b11e5a50a3ec28aa9622adfccd0cc477e079d40a..a042324108f5dedd4346330c71e5d6ba756c847a 100644 (file)
--- a/bacula/src/lib/serial.c
+++ b/bacula/src/lib/serial.c
@@ -3,11 +3,11 @@
                   Serialisation Support Functions
                          John Walker
 
-  
+
      Version $Id$
 */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -165,11 +165,12 @@ void serial_float64(uint8_t * * const ptr, const float64_t v)
     *ptr += sizeof(float64_t);
 }
 
-int serial_string(uint8_t * const ptr, char * const str)
+void serial_string(uint8_t * * const ptr, const char * const str)
 {
-   int len = strlen((const char *) str) + 1;
-   memcpy(ptr, str, len);
-   return len;
+   int len = strlen(str) + 1;
+
+   memcpy(*ptr, str, len);
+   *ptr += len;
 }
 
 
@@ -242,7 +243,7 @@ uint64_t unserial_uint64(uint8_t * * const ptr)
 
 /*  unserial_btime  -- Unserialise a btime_t 64 bit integer.  */
 
-uint64_t unserial_btime(uint8_t * * const ptr)
+btime_t unserial_btime(uint8_t * * const ptr)
 {
     btime_t v;
 
@@ -293,9 +294,9 @@ float64_t unserial_float64(uint8_t * * const ptr)
     return v;
 }
 
-int unserial_string(uint8_t  * const ptr, char * const str)
+void unserial_string(uint8_t * * const ptr, char * const str)
 {
-   int len = strlen((char *)ptr) + 1;
-   memcpy(str, ptr, len);
-   return len;
+   int len = strlen((char *) *ptr) + 1;
+   memcpy(str, (char *) *ptr, len);
+   *ptr += len;
 }