Changeset 302714f

Timestamp:

10/13/06 11:31:11 (14 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:

2e420ff

Parents:

428c837

Message:

Fix some warnings

Location:

lib

Files:

• format_pcapfile.c (modified) (1 diff)
• trace.c (modified) (2 diffs)

lib/format_pcapfile.c

@@ -186 +186 @@
 
 static int pcapfile_config_output(libtrace_out_t *libtrace,
-                trace_option_t option,
+                trace_option_output_t option,
                 void *value)
 {

lib/trace.c

@@ -780 +780 @@
                 tv.tv_usec = (uint32_t)(((seconds - tv.tv_sec) * 1000000)/UINT_MAX);
         }
+        else {
+                tv.tv_sec=-1;
+                tv.tv_usec=-1;
+        }
 
         return tv;
@@ -952 +956 @@
                 libtrace_linktype_t linktype=trace_get_link_type(packet);
                 if (linktype==(libtrace_linktype_t)-1) {
-                        trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
+                        trace_set_err(packet->trace,
+                                        TRACE_ERR_BAD_PACKET,
                                         "Packet has an unknown linktype");
                         return -1;