Changeset 6901 in orxonox.OLD for branches/network

Timestamp:

Jan 31, 2006, 4:45:33 PM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src/lib/network

Files:

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

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

@@ -90 +90 @@
  * @return: The number of written bytes
  */
-int Converter::intToByteArray(int x, byte* a, int length)
+int Converter::_intToByteArray(int x, byte* a, int length)
 {
   if (length < INTSIZE)
@@ -127 +127 @@
  * @return: The number of read bytes
  */
-int Converter::byteArrayToInt(const byte* a, int* x)
+int Converter::_byteArrayToInt(const byte* a, int* x)
 {
   int mult = 1;
@@ -146 +146 @@
     *x += a[INTSIZE - 1] * mult;
 
+  return INTSIZE;
+}
+
+int Converter::byteArrayToInt(const byte* a, int* x)
+{
+  memcpy( x, a, INTSIZE );
+  return INTSIZE;
+}
+
+int Converter::intToByteArray(int x, byte* a, int length)
+{
+  if ( length< INTSIZE )
+  {
+    PRINTF(1)("Byte Array to small\n");
+    return 0;
+  }
+  memcpy(a, &x, INTSIZE);
   return INTSIZE;
 }

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

@@ -30 +30 @@
     static int intToByteArray(int x, byte* a, int length);
     static int byteArrayToInt(const byte* a, int* x);
+    
+    static int _intToByteArray(int x, byte* a, int length);
+    static int _byteArrayToInt(const byte* a, int* x);
 
     static int stringToByteArray(const char* s, byte* a, int length, int maxLength);