Changeset 931 for trunk/lib/format_pcapfile.c

Timestamp:

08/21/06 23:18:19 (7 years ago)

Author:

perry

Message:

Convert pcapfile over to using byteswap{16,32}.
Fix typos in previous commit

File:

• trunk/lib/format_pcapfile.c (modified) (3 diffs)

trunk/lib/format_pcapfile.c

@@ -80 +80 @@
                 return num;
         if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
-                return ((num<<8)&0xFF00)|((num>>8)&0x00FF);
+                return byteswap16(num);
+
         return num;
 }
@@ -92 +93 @@
                 return num;
         if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
-                return 
-                           ((num&0x000000FF)<<24)
-                        || ((num&0x0000FF00)<<8)
-                        || ((num&0x00FF0000)>>8)
-                        || ((num&0xFF000000)>>24);
+                return byteswap32(num);
+
         return num;
 }
@@ -154 +152 @@
 }
 
-static int pcapfile_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
+static int pcapfile_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet)
+{
         int err;