Attempt to fix bat seg faults

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

diff --git a/bacula/src/lib/serial.h b/bacula/src/lib/serial.h
index 528819739e1962f336c17fe0bc481d0e12cacdfc..615128754348c292184c461c586822cbb0e77798 100644 (file)
--- a/bacula/src/lib/serial.h
+++ b/bacula/src/lib/serial.h
@@ -1,26 +1,35 @@
 /*
- *
- *   Version $Id$
- */
+   Bacula® - The Network Backup Solution
 
-/*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark ofKern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ *
+ * Written by John Walker, MM
+ *
+ *   Version $Id$
  */
 
 /*  Serialisation support functions from serial.c.  */
@@ -47,7 +56,7 @@ 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.
@@ -66,16 +75,16 @@ extern void unserial_string(uint8_t * * const ptr, char * const str);
 #define unser_begin(x, s) ser_ptr = ((uint8_t *)(x))
 
 /*  ser_length  --  Determine length in bytes of serialised into a
-                   buffer x.  */
-#define ser_length(x)  (ser_ptr - (uint8_t *)(x))
-#define unser_length(x)  (ser_ptr - (uint8_t *)(x))
+                    buffer x.  */
+#define ser_length(x)  ((uint32_t)(ser_ptr - (uint8_t *)(x)))
+#define unser_length(x) ((uint32_t)(ser_ptr - (uint8_t *)(x)))
 
 /*  ser_end(x, s)  --  End serialisation into a buffer x of size s.  */
 #define ser_end(x, s)   ASSERT(ser_length(x) <= (s))
 #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                   */