Changeset 8d1956e for lib

Timestamp:

04/28/05 16:33:54 (17 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:

b33a242

Parents:

b13027e

Message:

typo in conditional in strndup.c
typos in trace.c

Location:

lib

Files:

• strndup.c (modified) (1 diff)
• trace.c (modified) (6 diffs)

lib/strndup.c

@@ -4 +4 @@
 #include "../config.h"
 
-#ifdef HAVE_STRNDUP
+#ifndef HAVE_STRNDUP
 
 #include <stdlib.h>

lib/trace.c

@@ -273 +273 @@
                 (*libtrace)->format=RTCLIENT;
         } else if (!strncasecmp(scan,"wagint",6)) {
+        struct ports_t *port;
                 (*libtrace)->format=WAGINT;
         } else if (!strncasecmp(scan,"wag",3)) {
@@ -1681 +1682 @@
 #ifdef DLT_LINUX_SLL
                         case TRACE_TYPE_LINUX_SLL:
-                                pcap = pcap_open_dead(DLT_LINUX_SLL, 1500);
+                                pcap = (pcap_t *)pcap_open_dead(DLT_LINUX_SLL, 1500);
                                 break;
 #endif
 #ifdef DLT_PFLOG
                         case TRACE_TYPE_PFLOG:
-                                pcap = pcap_open_dead(DLT_PFLOG, 1500);
+                                pcap = (pcap_t *)pcap_open_dead(DLT_PFLOG, 1500);
                                 break;
 #endif
@@ -1833 +1834 @@
 {
         struct libtrace_ip *ip = trace_get_ip(packet);
+        struct ports_t *port;
         if (6 != ip->ip_p
           && 17 != ip->ip_p)
@@ -1839 +1841 @@
                 return 0;
 
-        struct ports_t *port;
         port = (struct ports_t *)((ptrdiff_t)ip + (ip->ip_hl * 4));
 
@@ -1849 +1850 @@
 {
         struct libtrace_ip *ip = trace_get_ip(packet);
+        struct ports_t *port;
 
         if (6 != ip->ip_p
@@ -1857 +1859 @@
                 return 0;
 
-        struct ports_t *port;
         port = (struct ports_t *)((ptrdiff_t)ip + (ip->ip_hl * 4));