Changeset 7230 in orxonox.OLD for trunk/src/lib/network/converter.cc

Timestamp:

Mar 21, 2006, 3:20:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std::branche back

File:

• trunk/src/lib/network/converter.cc (modified) (5 diffs)

trunk/src/lib/network/converter.cc

@@ -159 +159 @@
   if ( length< INTSIZE )
   {
-    PRINTF(1)("Byte Array to small\n");
+    PRINTF(1)("Byte Array to small : %d\n", length);
     return 0;
   }
@@ -457 +457 @@
  * @return: the used number of bytes in byte array
  */
-int Converter::stringToByteArray( const char * s, byte * a, int length, int maxLength )
-{
-  if ( length+INTSIZE > maxLength )
-  {
-    PRINTF(1)("Byte array is too small (%d) to store %d bytes\n", maxLength, length+INTSIZE);
+int Converter::stringToByteArray( const std::string & s, byte * a, int maxLength )
+{
+  if ( s.length()+INTSIZE > maxLength )
+  {
+    PRINTF(1)("Byte array is too small (%d) to store %d bytes\n", maxLength, s.length()+INTSIZE);
     return -1;
   }
 
-  int n = Converter::intToByteArray( length, a, maxLength );
-
-  memcpy( a+INTSIZE, s, length );
-
-  return length + INTSIZE;
+  int n = Converter::intToByteArray( s.length(), a, maxLength );
+
+  memcpy( a+INTSIZE, s.c_str(), s.length() );
+
+  return s.length() + INTSIZE;
 }
 
@@ -479 +479 @@
  * @return: the number of read bytes in byte array
  */
-int Converter::byteArrayToString( const byte * a, char * s, int maxLength )
+int Converter::byteArrayToString( const byte * a, std::string&s, int maxLength )
 {
   int length;
@@ -488 +488 @@
   if ( length+1 > maxLength )
   {
-    PRINTF(1)("There is not enough space in string (%d) to store %d bytes\n", maxLength, length+1 );
-    strncpy(s,"",maxLength);
+    PRINTF(1)("something went wrong length > remaining bytes in buffer\n" );
+    s = "";
     return -1;
   }
 
-  memcpy( s, a+n, length );
-  s[length] = '\0';
+  s[0] = '\0';
+  s.append( (char*)a+n, length );
 
   return n+length;
 }
 
+#if 0
 /**
  * reads a string out of a byte array and allocates memory for string
@@ -525 +526 @@
   return n+length;
 }
-
+#endif