Changeset 6285 in orxonox.OLD

Timestamp:

Dec 25, 2005, 4:24:50 PM (18 years ago)

Author:

rennerc

Message:

converter: added function which allocates momory

Location:

branches/network/src/lib/network

Files:

• converter.cc (modified) (1 diff)
• converter.h (modified) (1 diff)
• synchronizeable.h (modified) (3 diffs)

branches/network/src/lib/network/converter.cc

@@ -453 +453 @@
   return n+length;
 }
+
+/**
+ * reads a string out of a byte array and allocates memory for string
+ * @param a: byte array
+ * @param s: string
+ * @param maxLength: max bytes to copy
+ * @return: the number of read bytes in byte array
+ */
+int Converter::byteArrayToStringM( const byte * a, char * & s )
+{
+  int length;
+
+  int n = Converter::byteArrayToInt( a, &length );
+
+  s = new char[n+1];
+
+  if ( !s )
+  {
+    PRINTF(1)("Could not allocate memory!\n" );
+    return -1;
+  }
+
+  memcpy( s, a+n, length );
+  s[length] = '\0';
+
+  return n+length;
+}
+

branches/network/src/lib/network/converter.h

@@ -35 +35 @@
     static int stringToByteArray(const char* s, byte* a, int length, int maxLength);
     static int byteArrayToString(const byte* a, char* s, int maxLength);
+    static int byteArrayToStringM(const byte* a, char*& s );
 
     //Test

branches/network/src/lib/network/synchronizeable.h

@@ -29 +29 @@
  * with the same argument names!
  *
+ * SYNCHELP_WRITE_BEGIN()
+ * SYNCHELP_WRITE_INT(i)
+ * SYNCHELP_WRITE_FLOAT(f)
+ * SYNCHELP_WRITE_BYTE(b)
+ * SYNCHELP_WRITE_STRING(s)
+ * SYNCHELP_WRITE_N
+ *
+ * SYNCHELP_READ_BEGIN()
+ * SYNCHELP_READ_INT(i)
+ * SYNCHELP_READ_FLOAT(f)
+ * SYNCHELP_READ_STRING(s,l) l = size of buffer s
+ * SYNCHELP_READ_STRINGM(s)  allocates memory for string! you have to free this after
+ * SYNCHELP_READ_BYTE(b)
+ *
+ *
  *
  * Example 1:
@@ -44 +59 @@
 #define SYNCHELP_WRITE_BEGIN()    int __synchelp_write_i = 0; \
                                   int __synchelp_write_n
-#define SYNCHELP_WRITE_RESET() { __synchelp_write_i = 0; __synchelp_write_err = false; }
 #define SYNCHELP_WRITE_INT(i) { __synchelp_write_n = \
                                 Converter::intToByteArray( i, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
@@ -112 +126 @@
                                     __synchelp_read_i += __synchelp_read_n; \
 }
+#define SYNCHELP_READ_STRINGM(s)    { \
+                                    __synchelp_read_n = Converter::byteArrayToStringM( data+__synchelp_read_i, s );  \
+                                    if ( __synchelp_read_n <0 )  \
+{ \
+                                      PRINTF(1)("There is not enough data to read string\n");  \
+                                      return; \
+} \
+                                    __synchelp_read_i += __synchelp_read_n; \
+}
 #define SYNCHELP_READ_BYTE(b)      { \
                                     if ( length-__synchelp_read_i < 1 ) \