Changeset a3041a4

Timestamp:

01/10/12 14:15:58 (9 years ago)

Author:

Shane Alcock <salcock@…>

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:

8753bb8

Parents:

a0ec6f1

Message:

• Fixed "unused but set" warnings that new gcc now likes to report

Files:

• examples/tutorial/headerdemo.c (modified) (3 diffs)
• lib/format_legacy.c (modified) (4 diffs)
• lib/format_linux.c (modified) (2 diffs)
• lib/trace.c (modified) (3 diffs)
• tools/traceanon/panon.c (modified) (2 diffs)
• tools/tracereport/synopt_report.c (modified) (2 diffs)

examples/tutorial/headerdemo.c

@@ -219 +219 @@
         uint32_t remaining;
         uint32_t prev_rem;
-        libtrace_ip_t *ip;
         libtrace_ip6_t *ip6;
 
@@ -243 +242 @@
                 case 0x0800:    /* IPv4 */
                         /* Skip past the IPv4 header */
-                        ip = (libtrace_ip_t *)ip_hdr;
                         nexthdr = trace_get_payload_from_ip(ip_hdr, &protocol, 
                                         &remaining);
@@ -332 +330 @@
         }
 
+        /* If we don't have any post-transport payload, just return the 
+         * transport header size */
+        if (!nexthdr)
+                return trans_size;
+        
         /* Determine how many bytes we just skipped over and add it to the
          * total transport size */

lib/format_legacy.c

@@ -141 +141 @@
          * other platforms, e.g. *BSDs, Windows */
         struct tm tm;
-        char *tz;
         time_t ret;
 
@@ -155 +154 @@
         tm.tm_isdst = -1; /* forces check for summer time */
         
-        tz = getenv("TZ");
+        getenv("TZ");
         if (putenv("TZ=Pacific/Auckland")) {
                 perror("putenv");
@@ -440 +439 @@
         uint32_t hdr_ts;
 
-        double dts;
-        
         legacy_nzix_t *legacy = (legacy_nzix_t *)packet->header;
                 
@@ -461 +458 @@
 
 
-        dts = tv.tv_sec + (double)tv.tv_usec / 1000 / 1000;
+        /*dts = tv.tv_sec + (double)tv.tv_usec / 1000 / 1000; */
         return tv;
         

lib/format_linux.c

@@ -459 +459 @@
         unsigned char controlbuf[CMSG_BUF_SIZE];
         struct cmsghdr *cmsg;
-        socklen_t socklen;
         int snaplen;
         uint32_t flags = 0;
@@ -475 +474 @@
 
         hdr=(struct libtrace_linuxnative_header*)packet->buffer;
-        socklen=sizeof(hdr->hdr);
         snaplen=LIBTRACE_MIN(
                         (int)LIBTRACE_PACKET_BUFSIZE-(int)sizeof(*hdr),

lib/trace.c

@@ -501 +501 @@
 {
         int ret;
-        libtrace_err_t err;
 
         if (trace_is_err(libtrace)) {
@@ -522 +521 @@
                         /* Clear the error if there was one */
                         if (trace_is_err(libtrace)) {
-                                err = trace_get_err(libtrace);
+                                trace_get_err(libtrace);
                         }
                         if (*(int*)value<0 
@@ -534 +533 @@
                         /* Clear the error if there was one */
                         if (trace_is_err(libtrace)) {
-                                err = trace_get_err(libtrace);
+                                trace_get_err(libtrace);
                         }
                         libtrace->filter=(libtrace_filter_t *)value;

tools/traceanon/panon.c

@@ -144 +144 @@
         uint8_t rin_input[16];
         
-        uint32_t firstnbits;
+        //uint32_t firstnbits;
 
         uint32_t result = 0;
@@ -172 +172 @@
         // result with this, then proceed
 
-        firstnbits = (uint32_t) orig_addr >> (32 - CACHEBITS);
+        //firstnbits = (uint32_t) orig_addr >> (32 - CACHEBITS);
         //result = (enc_cache[firstnbits] << (32 - CACHEBITS));
 

tools/tracereport/synopt_report.c

@@ -104 +104 @@
         unsigned char *opt_ptr;
         libtrace_direction_t dir = trace_get_direction(packet);
-        int tcp_payload, len;
+        int len;
         unsigned char type, optlen, *data;
         struct tcp_opts opts_seen = {false, false, false, false, false, false};
@@ -120 +120 @@
         if(len == 0)
                 return;
-        
-        tcp_payload = trace_get_wire_length(packet) - trace_get_capture_length(packet);
         
         opt_ptr = (unsigned char *)tcp + sizeof (libtrace_tcp_t);