Changeset 33d83d4 for lib/trace.c

Timestamp:

11/14/06 11:49:11 (16 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:

cab58c5

Parents:

b9aa767

Message:

Fixed up brazillions of warnings

File:

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

lib/trace.c

@@ -212 +212 @@
 }
 
-void erf_constructor();
-void legacy_constructor();
-void linuxnative_constructor();
-void pcap_constructor();
-void pcapfile_constructor();
-void rt_constructor();
-void wag_constructor();
-void duck_constructor();
+void erf_constructor(void);
+void legacy_constructor(void);
+void linuxnative_constructor(void);
+void pcap_constructor(void);
+void pcapfile_constructor(void);
+void rt_constructor(void);
+void wag_constructor(void);
+void duck_constructor(void);
 
 /* call all the constructors if they haven't yet all been called */
-void trace_init(void)
+static void trace_init(void)
 {
         if (!formats_list) {
@@ -602 +602 @@
  * @author Shane Alcock
  * */
-DLLEXPORT void trace_destroy_output(libtrace_out_t *libtrace) {
+DLLEXPORT void trace_destroy_output(libtrace_out_t *libtrace) 
+{
         assert(libtrace);
         libtrace->format->fin_output(libtrace);
@@ -609 +610 @@
 }
 
-DLLEXPORT libtrace_packet_t *trace_create_packet() {
+DLLEXPORT libtrace_packet_t *trace_create_packet(void) 
+{
         libtrace_packet_t *packet = 
                 (libtrace_packet_t*)calloc(1,sizeof(libtrace_packet_t));
@@ -997 +999 @@
 #ifdef HAVE_BPF
         void *linkptr = 0;
-        int clen = 0;
+        unsigned int clen = 0;
         bool free_packet_needed = false;
         int ret;
+        libtrace_packet_t *packet_copy = packet;
+
         assert(filter);
         assert(packet);
-        libtrace_packet_t *packet_copy = packet;
-
-        
-        if (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0) {
+
+        if (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0U) {
                 /* Copy the packet, as we don't want to trash the one we
                  * were passed in
@@ -1012 +1014 @@
                 free_packet_needed=true;
                 while (libtrace_to_pcap_dlt(trace_get_link_type(packet_copy))==
-                                ~0) {
+                                ~0U) {
                         if (!demote_packet(packet_copy)) {
-                                trace_set_err_out(packet->trace, 
+                                trace_set_err(packet->trace, 
                                                 TRACE_ERR_NO_CONVERSION,
                                                 "pcap does not support this format");