Changeset 476 for abuseTweet

Timestamp:

Apr 15, 2011, 7:34:53 AM (11 years ago)

Author:

Sam Hocevar

Message:

Fix a few compiler warnings caused by bad type punning.

Location:

abuse/trunk/src

Files:

• cache.cpp (modified) (1 diff)
• imlib/palette.cpp (modified) (2 diffs)
• net/fileman.cpp (modified) (1 diff)
• netface.hpp (modified) (2 diffs)

abuse/trunk/src/cache.cpp

@@ -524 +524 @@
     for (i=0;i<tsaved;i++)
     {
-      uint8_t type=fp->read_uint8();
+      fp->read_uint8(); // read type
       short file_num=fp->read_uint16();
       if (file_num>=tnames)  // bad data?

abuse/trunk/src/imlib/palette.cpp

@@ -100 +100 @@
 
 uint32_t palette::getquad(int x)
-{ char entry[4];
+{ union { char entry[4]; uint32_t ret; };
   entry[3]=0;
   entry[2]=pal[x].red;
   entry[1]=pal[x].green;
   entry[0]=pal[x].blue;
-  return *((uint32_t *)entry);
+  return ret;
 }
 
@@ -261 +261 @@
   else if (ncolors==16)
     for (i=0;i<ncolors;i++)
-      set(i,255-(i&3),255-(i&4)>>2,255-(i&8)>>3);
+      set(i,255-(i&3),255-((i&4)>>2),255-((i&8)>>3));
   else
     for (i=0;i<ncolors;i++)

abuse/trunk/src/net/fileman.cpp

@@ -141 +141 @@
 
     actual=read(file_fd,buf+2,read_total);
-    *((ushort *)buf)=lstl(actual);
+    ushort tmp = lstl(actual);
+    memcpy(buf, &tmp, sizeof(tmp));
 
     int write_amount=sock->write(buf,actual+2);

abuse/trunk/src/netface.hpp

@@ -107 +107 @@
   uint8_t data[PACKET_MAX_SIZE];
   int packet_prefix_size()                 { return 5; }    // 2 byte size, 2 byte check sum, 1 byte packet order
-  uint16_t packet_size()             { uint16_t size=(*(uint16_t *)data); return lstl(size); }
+  uint16_t packet_size()             { uint16_t size; memcpy(&size, data, sizeof(size)); return lstl(size); }
   uint8_t tick_received()            { return data[4]; }
   void set_tick_received(uint8_t x)  { data[4]=x; }
@@ -142 +142 @@
   void write_uint32(uint32_t x) { x=lltl(x); add_to_packet(&x,4); }
 
-  void set_packet_size(uint16_t x) { *((uint16_t *)data)=lstl(x); }
+  void set_packet_size(uint16_t x) { uint16_t tmp = lstl(x); memcpy(data, &tmp, sizeof(tmp)); }