Diff: rosserial_msgs/Log.h

Revision:

5:8cd48977ec68

Parent:

3:1cf99502f396

--- a/rosserial_msgs/Log.h	Wed Feb 29 23:00:21 2012 +0000
+++ b/rosserial_msgs/Log.h	Sat Oct 26 15:38:35 2013 +0000
@@ -14,7 +14,7 @@
     public:
       uint8_t level;
       char * msg;
-      enum { DEBUG = 0 };
+      enum { ROSDEBUG = 0 };
       enum { INFO = 1 };
       enum { WARN = 2 };
       enum { ERROR = 3 };
@@ -25,20 +25,21 @@
       int offset = 0;
       *(outbuffer + offset + 0) = (this->level >> (8 * 0)) & 0xFF;
       offset += sizeof(this->level);
-      uint32_t * length_msg = (uint32_t *)(outbuffer + offset);
-      *length_msg = strlen( (const char*) this->msg);
+      uint32_t length_msg = strlen( (const char*) this->msg);
+      memcpy(outbuffer + offset, &length_msg, sizeof(uint32_t));
       offset += 4;
-      memcpy(outbuffer + offset, this->msg, *length_msg);
-      offset += *length_msg;
+      memcpy(outbuffer + offset, this->msg, length_msg);
+      offset += length_msg;
       return offset;
     }
 
     virtual int deserialize(unsigned char *inbuffer)
     {
       int offset = 0;
-      this->level |= ((uint8_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      this->level =  ((uint8_t) (*(inbuffer + offset)));
       offset += sizeof(this->level);
-      uint32_t length_msg = *(uint32_t *)(inbuffer + offset);
+      uint32_t length_msg;
+      memcpy(&length_msg, (inbuffer + offset), sizeof(uint32_t));
       offset += 4;
       for(unsigned int k= offset; k< offset+length_msg; ++k){
           inbuffer[k-1]=inbuffer[k];
@@ -50,9 +51,9 @@
     }
 
     virtual const char * getType(){ return "rosserial_msgs/Log"; };
-    virtual const char * getMD5(){ return "7170d5aec999754ba0d9f762bf49b913"; };
+    virtual const char * getMD5(){ return "11abd731c25933261cd6183bd12d6295"; };
 
   };
 
 }
-#endif
\ No newline at end of file
+#endif