Changeset 1090 for trunk/lib/format_pcapfile.c

Timestamp:

11/14/06 11:49:11 (7 years ago)

Author:

perry

Message:

Fixed up brazillions of warnings

File:

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

trunk/lib/format_pcapfile.c

@@ -267 +267 @@
          * pop off the top header until it can be converted
          */
-        while (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0) {
+        while (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0U) {
                 if (!demote_packet(packet)) {
                         trace_set_err_out(out, 
@@ -281 +281 @@
          */
         if (!DATAOUT(out)->file) {
-                struct pcapfile_header_t hdr;
+                struct pcapfile_header_t pcaphdr;
 
                 DATAOUT(out)->file=trace_open_file_out(out,
@@ -289 +289 @@
                         return -1;
 
-                hdr.magic_number = 0xa1b2c3d4;
-                hdr.version_major = 2;
-                hdr.version_minor = 4;
-                hdr.thiszone = 0;
-                hdr.sigfigs = 0;
-                hdr.snaplen = 65536;
-                hdr.network = 
+                pcaphdr.magic_number = 0xa1b2c3d4;
+                pcaphdr.version_major = 2;
+                pcaphdr.version_minor = 4;
+                pcaphdr.thiszone = 0;
+                pcaphdr.sigfigs = 0;
+                pcaphdr.snaplen = 65536;
+                pcaphdr.network = 
                         libtrace_to_pcap_dlt(trace_get_link_type(packet));
 
-                libtrace_io_write(DATAOUT(out)->file, &hdr, sizeof(hdr));
+                libtrace_io_write(DATAOUT(out)->file, &pcaphdr, sizeof(pcaphdr));
         }
 
@@ -451 +451 @@
 }
 
-static void pcapfile_help() {
+static void pcapfile_help(void) {
         printf("pcapfile format module: $Revision$\n");
         printf("Supported input URIs:\n");
@@ -497 +497 @@
 
 
-void pcapfile_constructor() {
+void pcapfile_constructor(void) {
         register_format(&pcapfile);
 }