Changeset 9c6aa95 for lib/trace.c

Timestamp:

10/07/05 17:31:17 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

9daf398

Parents:

5c88a60

Message:

cleaned up after compiling with -Wall -W

File:

• lib/trace.c (modified) (8 diffs)

lib/trace.c

@@ -241 +241 @@
         char *uridata = 0;                  
         int i = 0;
-        struct stat buf;
+        //struct stat buf;
         
         trace_err.err_num = E_NOERROR;
@@ -433 +433 @@
         parse_cmd(opt_string, &opt_argc, opt_argv, MAXOPTS);
         
-        if (libtrace->format->config_output)
+        if (libtrace->format->config_output) {
                 return libtrace->format->config_output(libtrace, opt_argc, opt_argv);
-
+        }
+        return -1;
 }
 
@@ -491 +492 @@
                 return libtrace->format->read_packet(libtrace,packet);
         }
+        return -1;
 }
 
@@ -508 +510 @@
                 return libtrace->format->write_packet(libtrace, packet);
         }
-
+        return -1;
 }
 
@@ -555 +557 @@
                                         if (eth->type == 0x0008) {
                                                 ipptr=(void*)eth->data;
-                                        } else if (eth->type = 0x0081) {
+                                        } else if (eth->type == 0x0081) {
                                                 // VLAN
                                                 if ((*(uint16_t *)(eth + 16)) == 0x0008) {
@@ -892 +894 @@
  */ 
 double trace_get_seconds(const struct libtrace_packet_t *packet) {
-        double seconds;
-        uint64_t ts;
+        double seconds = 0.0;
+        uint64_t ts = 0;
         struct timeval tv;
         
@@ -1206 +1208 @@
  * @author Daniel Lawson
  */
-int8_t trace_get_server_port(uint8_t protocol, uint16_t source, uint16_t dest) {
+int8_t trace_get_server_port(uint8_t protocol __attribute__((unused)), uint16_t source, uint16_t dest) {
         /*
          * * If the ports are equal, return DEST
@@ -1218 +1220 @@
          * * flip a coin.
          */
-
-        uint16_t server, client;
-
+        
         /* equal */
-        if (source == client)
+        if (source == dest)
                 return USE_DEST;