Changeset 3ac4bf7

Timestamp:

04/02/08 16:35:39 (14 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:

87d7ab9

Parents:

dd1217b

Message:

• Fixing more variables that aren't declared at the beginning of a code block

Location:

lib

Files:

• protocols_l2.c (modified) (2 diffs)
• protocols_pktmeta.c (modified) (4 diffs)

lib/protocols_l2.c

@@ -221 +221 @@
 {
         uint32_t dummyrem;
+        void *meta = NULL;
         
         assert(packet != NULL);
@@ -228 +229 @@
                 remaining = &dummyrem;
         
-        void *meta = trace_get_packet_meta(packet, linktype, remaining);
+        meta = trace_get_packet_meta(packet, linktype, remaining);
 
         /* If there are no meta-data headers, we just return the start of the

lib/protocols_pktmeta.c

@@ -90 +90 @@
 {
         uint32_t dummyrem;
-
+        void *pktbuf = NULL;
         assert(packet != NULL);
         assert(linktype != NULL);
@@ -97 +97 @@
                 remaining = &dummyrem;
         
-        void *pktbuf = trace_get_packet_buffer(packet, linktype, remaining);
+        pktbuf = trace_get_packet_buffer(packet, linktype, remaining);
         switch (*linktype) {
                 case TRACE_TYPE_LINUX_SLL:
@@ -182 +182 @@
 static
 uint8_t *get_source_mac_from_wifi(void *wifi) {
+        struct libtrace_80211_t *w;
         if (wifi == NULL) return NULL;
-        struct libtrace_80211_t *w = (struct libtrace_80211_t *) wifi;
+        w = (struct libtrace_80211_t *) wifi;
         
         /* If the frame is of type CTRL */
@@ -242 +243 @@
         libtrace_linktype_t linktype;
         uint32_t remaining;
-
+        libtrace_80211_t *wifi;
+        libtrace_ether_t *ethptr;
+        
         link = trace_get_layer2(packet,&linktype,&remaining);
 
-        libtrace_80211_t *wifi;
-        libtrace_ether_t *ethptr = (libtrace_ether_t*)link;
+        ethptr = (libtrace_ether_t*)link;