Fix header file includes.

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

diff --git a/bacula/src/lib/serial.h b/bacula/src/lib/serial.h
index 7066e776b893727b855869cef992f511740137d8..528819739e1962f336c17fe0bc481d0e12cacdfc 100644 (file)
--- a/bacula/src/lib/serial.h
+++ b/bacula/src/lib/serial.h
@@ -1,4 +1,7 @@
-
+/*
+ *
+ *   Version $Id$
+ */
 
 /*
    Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
@@ -22,26 +25,29 @@
 
 /*  Serialisation support functions from serial.c.  */
 
-extern void serial_int16(uint8_t * * ptr, int16_t v);
-extern void serial_uint16(uint8_t * * ptr, uint16_t v);
-extern void serial_int32(uint8_t * * ptr, int32_t v);
-extern void serial_uint32(uint8_t * * ptr, uint32_t v);
+extern void serial_int16(uint8_t * * const ptr, const int16_t v);
+extern void serial_uint16(uint8_t * * const ptr, const uint16_t v);
+extern void serial_int32(uint8_t * * const ptr, const int32_t v);
+extern void serial_uint32(uint8_t * * const ptr, const uint32_t v);
 extern void serial_int64(uint8_t * * ptr, int64_t v);
-extern void serial_uint64(uint8_t * * ptr, uint64_t v);
-extern void serial_float64(uint8_t * * ptr, float64_t v);
-extern int  serial_string(uint8_t * ptr, char * str);
-extern int16_t unserial_int16(uint8_t * * ptr);
-extern uint16_t unserial_uint16(uint8_t * * ptr);
-extern int32_t unserial_int32(uint8_t * * ptr);
-extern uint32_t unserial_uint32(uint8_t * * ptr);
-extern int64_t unserial_int64(uint8_t * * ptr);
-extern uint64_t unserial_uint64(uint8_t * * ptr);
-extern float64_t unserial_float64(uint8_t * * ptr);
-extern int unserial_string(uint8_t * ptr, char * str);
+extern void serial_uint64(uint8_t * * const ptr, const uint64_t v);
+extern void serial_btime(uint8_t * * const ptr, const btime_t v);
+extern void serial_float64(uint8_t * * const ptr, const float64_t v);
+extern void serial_string(uint8_t * * const ptr, const char * const str);
+
+extern int16_t unserial_int16(uint8_t * * const ptr);
+extern uint16_t unserial_uint16(uint8_t * * const ptr);
+extern int32_t unserial_int32(uint8_t * * const ptr);
+extern uint32_t unserial_uint32(uint8_t * * const ptr);
+extern int64_t unserial_int64(uint8_t * * const ptr);
+extern uint64_t unserial_uint64(uint8_t * * const ptr);
+extern btime_t unserial_btime(uint8_t * * const ptr);
+extern float64_t unserial_float64(uint8_t * * const ptr);
+extern void unserial_string(uint8_t * * const ptr, char * const str);
 
 /*
 
-                         Serialisation Macros
+                        Serialisation Macros
 
     These macros use a uint8_t pointer, ser_ptr, which must be
     defined by the code which uses them.
@@ -60,7 +66,7 @@ extern int unserial_string(uint8_t * ptr, char * str);
 #define unser_begin(x, s) ser_ptr = ((uint8_t *)(x))
 
 /*  ser_length  --  Determine length in bytes of serialised into a
-                    buffer x.  */
+                   buffer x.  */
 #define ser_length(x)  (ser_ptr - (uint8_t *)(x))
 #define unser_length(x)  (ser_ptr - (uint8_t *)(x))
 
@@ -69,7 +75,7 @@ extern int unserial_string(uint8_t * ptr, char * str);
 #define unser_end(x, s)   ASSERT(ser_length(x) <= (s))
 
 /*  ser_check(x, s)  --  Verify length of serialised data in buffer x is
-                         expected length s.  */
+                        expected length s.  */
 #define ser_check(x, s) ASSERT(ser_length(x) == (s))
 
 /*                          Serialisation                   */
@@ -94,6 +100,9 @@ extern int unserial_string(uint8_t * ptr, char * str);
 /*  64 bit unsigned integer  */
 #define ser_uint64(x)   serial_uint64(&ser_ptr, x)
 
+/* btime -- 64 bit unsigned integer */
+#define ser_btime(x)    serial_btime(&ser_ptr, x)
+
 
 /*  64 bit IEEE floating point number  */
 #define ser_float64(x)  serial_float64(&ser_ptr, x)
@@ -108,7 +117,7 @@ extern int unserial_string(uint8_t * ptr, char * str);
 #define ser_buffer(x)   ser_bytes((x), (sizeof (x)))
 
 /* Binary string not requiring serialization */
-#define ser_string(x)   ser_ptr += serial_string(ser_ptr, (x))
+#define ser_string(x)   serial_string(&ser_ptr, (x))
 
 /*                         Unserialisation                  */
 
@@ -132,6 +141,9 @@ extern int unserial_string(uint8_t * ptr, char * str);
 /*  64 bit unsigned integer  */
 #define unser_uint64(x) (x) = unserial_uint64(&ser_ptr)
 
+/* btime -- 64 bit unsigned integer */
+#define unser_btime(x) (x) = unserial_btime(&ser_ptr)
+
 /*  64 bit IEEE floating point number  */
 #define unser_float64(x)(x) = unserial_float64(&ser_ptr)
 
@@ -145,6 +157,6 @@ extern int unserial_string(uint8_t * ptr, char * str);
 #define unser_buffer(x)  unser_bytes((x), (sizeof (x)))
 
 /* Binary string not requiring serialization */
-#define unser_string(x) ser_ptr += unserial_string(ser_ptr, (x))
+#define unser_string(x) unserial_string(&ser_ptr, (x))
 
 #endif /* __SERIAL_H_ */