OSSP CVS Repository

ossp - Check-in [560]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 560
Date: 2001-Jul-23 17:33:42 (local)
2001-Jul-23 15:33:42 (UTC)
User:simons
Branch:
Comment: Removed redundant include of sys/types.h.
Tickets:
Inspections:
Files:
ossp-pkg/xds/Makefile.in      1.6 -> 1.7     1 inserted, 1 deleted
ossp-pkg/xds/regression-tests/xds-mystruct.c      1.3->removed
ossp-pkg/xds/xdr-decode-int32.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-decode-int64.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-decode-octetstream.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-decode-string.c      added-> 1.4
ossp-pkg/xds/xdr-decode-uint32.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-decode-uint64.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-encode-int32.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-encode-int64.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-encode-octetstream.c      1.3 -> 1.4     0 inserted, 1 deleted
ossp-pkg/xds/xdr-encode-string.c      added-> 1.5
ossp-pkg/xds/xdr-encode-uint32.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/xdr-encode-uint64.c      1.2 -> 1.3     0 inserted, 1 deleted
ossp-pkg/xds/Makefile.in 1.6 -> 1.7 

--- Makefile.in  2001/07/23 15:28:53     1.6
+++ Makefile.in  2001/07/23 15:33:42     1.7
@@ -15,7 +15,7 @@
                   xdr-decode-int64.o xdr-decode-uint32.o xdr-decode-uint64.o \
                   xdr-encode-octetstream.o xdr-decode-octetstream.o \
                   xdr-encode-string.o xdr-decode-string.o xdr-encode-double.o \
-                  xdr-decode-double.o xml-encode-int32.o
+                  xdr-decode-double.o xml-encode-int32.o xml-decode-int32.o
 
 .c.o:
         $(CC) $(CPPFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(CFLAGS) -c $<

ossp-pkg/xds/regression-tests/xds-mystruct.c 1.3 -> 1.4 

--- xds-mystruct.c       2001/07/20 10:56:02     1.3
+++ xds-mystruct.c       2001/07/23 15:33:43     1.4
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <sys/types.h>
 #include "../internal.h"
 
 struct mystruct

ossp-pkg/xds/xdr-decode-int32.c 1.2 -> 1.3 

--- xdr-decode-int32.c   2001/07/20 10:56:01     1.2
+++ xdr-decode-int32.c   2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_decode_int32(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-decode-int64.c 1.2 -> 1.3 

--- xdr-decode-int64.c   2001/07/20 10:56:01     1.2
+++ xdr-decode-int64.c   2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_decode_int64(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-decode-octetstream.c 1.2 -> 1.3 

--- xdr-decode-octetstream.c     2001/07/20 10:56:01     1.2
+++ xdr-decode-octetstream.c     2001/07/23 15:33:42     1.3
@@ -27,7 +27,6 @@
 
 #include <string.h>
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_decode_octetstream(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-decode-string.c -> 1.4 

*** /dev/null    Sun Apr 28 00:11:52 2024
--- -    Sun Apr 28 00:12:15 2024
***************
*** 0 ****
--- 1,89 ----
+ /*
+    XDS - OSSP Extensible Data Serialization Library
+    Copyright (c) 2001 The OSSP Project (http://www.ossp.org/)
+    Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/)
+ 
+    This file is part of OSSP XDS, an extensible data serialization
+    library which can be found at http://www.ossp.com/pkg/xds/.
+ 
+    Permission to use, copy, modify, and distribute this software for
+    any purpose with or without fee is hereby granted, provided that
+    the above copyright notice and this permission notice appear in all
+    copies.
+ 
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+ */
+ 
+ #include <string.h>
+ #include <assert.h>
+ #include "internal.h"
+ 
+ int xdr_decode_string(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)
+     {
+     char**  p;
+     size_t* p_len;
+     size_t  padding;
+ 
+     /* Consistency checks. */
+ 
+     assert(xds != NULL);
+     assert(buffer != NULL);
+     assert(buffer_size != 0);
+     assert(args != NULL);
+     if (xds == NULL || buffer == NULL || buffer_size == 0 || args == NULL)
+        return XDS_ERR_INVALID_ARG;
+ 
+     /* Get pointers from the stack. */
+ 
+     p     = va_arg(*args, char**);
+     p_len = va_arg(*args, size_t*);
+     assert(p != NULL);
+     assert(p_len != NULL);
+ 
+     /* Read the size of the message. */
+ 
+     if (buffer_size >= 4)
+        {
+        *p_len  = ((xds_uint8_t*)buffer)[0]; *p_len = *p_len << 8;
+        *p_len += ((xds_uint8_t*)buffer)[1]; *p_len = *p_len << 8;
+        *p_len += ((xds_uint8_t*)buffer)[2]; *p_len = *p_len << 8;
+        *p_len += ((xds_uint8_t*)buffer)[3];
+        }
+     else
+        return XDS_ERR_UNDERFLOW;
+ 
+     /* Calculate padding. */
+ 
+     padding = (4 - (*p_len & 0x03)) & 0x03;
+ 
+     /* Do we have enough data?. */
+ 
+     if (buffer_size < 4 + *p_len + padding)
+        return XDS_ERR_UNDERFLOW;
+ 
+     /* Allocate buffer for the data. */
+ 
+     *p = (char*)malloc(*p_len + 1);
+     if (*p == NULL)
+        return XDS_ERR_NO_MEM;
+ 
+     /* Copy data into the buffer. */
+ 
+     memmove(*p, (xds_uint8_t*)buffer+4, *p_len);
+     ((xds_uint8_t*)buffer)[4+*p_len] = '\0';
+ 
+     /* Done. */
+ 
+     return 4 + *p_len + padding;
+     }

ossp-pkg/xds/xdr-decode-uint32.c 1.2 -> 1.3 

--- xdr-decode-uint32.c  2001/07/20 10:56:01     1.2
+++ xdr-decode-uint32.c  2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_decode_uint32(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-decode-uint64.c 1.2 -> 1.3 

--- xdr-decode-uint64.c  2001/07/20 10:56:01     1.2
+++ xdr-decode-uint64.c  2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_decode_uint64(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-encode-int32.c 1.2 -> 1.3 

--- xdr-encode-int32.c   2001/07/20 10:56:01     1.2
+++ xdr-encode-int32.c   2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_encode_int32(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-encode-int64.c 1.2 -> 1.3 

--- xdr-encode-int64.c   2001/07/20 10:56:01     1.2
+++ xdr-encode-int64.c   2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_encode_int64(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-encode-octetstream.c 1.3 -> 1.4 

--- xdr-encode-octetstream.c     2001/07/20 10:56:01     1.3
+++ xdr-encode-octetstream.c     2001/07/23 15:33:42     1.4
@@ -27,7 +27,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_encode_octetstream(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-encode-string.c -> 1.5 

*** /dev/null    Sun Apr 28 00:11:52 2024
--- -    Sun Apr 28 00:12:15 2024
***************
*** 0 ****
--- 1,71 ----
+ /*
+    XDS - OSSP Extensible Data Serialization Library
+    Copyright (c) 2001 The OSSP Project (http://www.ossp.org/)
+    Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/)
+ 
+    This file is part of OSSP XDS, an extensible data serialization
+    library which can be found at http://www.ossp.com/pkg/xds/.
+ 
+    Permission to use, copy, modify, and distribute this software for
+    any purpose with or without fee is hereby granted, provided that
+    the above copyright notice and this permission notice appear in all
+    copies.
+ 
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+ */
+ 
+ #include <assert.h>
+ #include <string.h>
+ #include "internal.h"
+ 
+ int xdr_encode_string(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)
+     {
+     char*  p;
+     size_t p_len;
+     size_t padding;
+ 
+     /* Consistency checks. */
+ 
+     assert(xds != NULL);
+     assert(buffer != NULL);
+     assert(buffer_size != 0);
+     assert(args != NULL);
+     if (xds == NULL || buffer == NULL || buffer_size == 0 || args == NULL)
+        return XDS_ERR_INVALID_ARG;
+ 
+     /* Get value from stack and calculate the correct amount of
+        padding. */
+ 
+     p       = va_arg(*args, char*);
+     assert(p != NULL);
+     p_len   = strlen(p);
+     padding = (4 - (p_len & 0x03)) & 0x03;
+     assert((p_len + padding) % 4 == 0);
+ 
+     /* Format the values into the buffer. */
+ 
+     if (buffer_size >= 4 + p_len + padding)
+        {
+        ((xds_uint8_t*)buffer)[0] = (p_len >> 24) & 0x000000ff;
+        ((xds_uint8_t*)buffer)[1] = (p_len >> 16) & 0x000000ff;
+        ((xds_uint8_t*)buffer)[2] = (p_len >>  8) & 0x000000ff;
+        ((xds_uint8_t*)buffer)[3] = (p_len >>  0) & 0x000000ff;
+        memmove((xds_uint8_t*)buffer+4, p, p_len);
+        memset((xds_uint8_t*)buffer+4+p_len, 0, padding);
+        }
+ 
+     /* Done. */
+ 
+     return 4 + p_len + padding;
+     }

ossp-pkg/xds/xdr-encode-uint32.c 1.2 -> 1.3 

--- xdr-encode-uint32.c  2001/07/20 10:56:01     1.2
+++ xdr-encode-uint32.c  2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_encode_uint32(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

ossp-pkg/xds/xdr-encode-uint64.c 1.2 -> 1.3 

--- xdr-encode-uint64.c  2001/07/20 10:56:01     1.2
+++ xdr-encode-uint64.c  2001/07/23 15:33:42     1.3
@@ -26,7 +26,6 @@
 */
 
 #include <assert.h>
-#include <sys/types.h>
 #include "internal.h"
 
 int xdr_encode_uint64(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)

CVSTrac 2.0.1