Changeset d7e8e67

Timestamp:

03/23/10 11:47:46 (12 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

ddab7f9

Parents:

f1ab057

Message:

Fix some annoying warnings

Files:

• lib/format_linux.c (modified) (1 diff)
• tools/tracediff/tracediff.c (modified) (3 diffs)

lib/format_linux.c

@@ -496 +496 @@
         hdr->wirelen = recvmsg(FORMAT(libtrace->format_data)->fd, &msghdr, 0);
 
-        if (hdr->wirelen==-1) {
+        if (hdr->wirelen==~0U) {
                 trace_set_err(libtrace,errno,"recvmsg");
                 return -1;
         }
 
-        hdr->caplen=LIBTRACE_MIN(snaplen,hdr->wirelen);
+        hdr->caplen=LIBTRACE_MIN((unsigned int)snaplen,(unsigned int)hdr->wirelen);
 
         /* Extract the timestamps from the msghdr and store them in our

tools/tracediff/tracediff.c

@@ -24 +24 @@
  * by the trace format, e.g. the ERF or PCAP header, is not examined.
  */
-void per_packet(libtrace_packet_t *a, libtrace_packet_t *b)
+static void per_packet(libtrace_packet_t *a, libtrace_packet_t *b)
 {
         char *buf_a, *buf_b;
@@ -74 +74 @@
 }
 
-void usage(char *prog) {
+static void usage(char *prog) {
         printf("Usage instructions for %s\n\n", prog);
         printf("\t%s [options] traceA traceB\n\n", prog);
@@ -89 +89 @@
         libtrace_t *trace[2];
         libtrace_packet_t *packet[2];
-        int opt, i;
+        int opt;
         
         if (argc<2) {