Changeset 871281c

Timestamp:

11/14/08 15:47:59 (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:

9b25f5f

Parents:

896ad39

Message:

Make sure NULL is defined.
Make sure stdio is included for printf
Use fprintf, not printf

Location:

lib

Files:

• protocols_l2.c (modified) (2 diffs)
• protocols_l3.c (modified) (1 diff)
• protocols_transport.c (modified) (2 diffs)

lib/protocols_l2.c

@@ -4 +4 @@
 #include "libtrace_int.h"
 #include <assert.h>
+#include <stdlib.h>
 
 /* Returns the payload from 802.3 ethernet.  Type optionally returned in
@@ -314 +315 @@
 {
         void *l;
-        assert(linktype != -1);
+        assert(linktype != ~0U);
         switch(linktype) {
                 /* Packet Metadata headers, not layer2 headers */

lib/protocols_l3.c

@@ -3 +3 @@
 #include "protocols.h"
 #include <assert.h>
+#include <stdlib.h>
 
 libtrace_ip_t *trace_get_ip(libtrace_packet_t *packet) 

lib/protocols_transport.c

@@ -2 +2 @@
 #include "protocols.h"
 #include <assert.h>
+#include <stdlib.h>
+#include <stdio.h> // fprintf
 
 DLLEXPORT void *trace_get_transport(const libtrace_packet_t *packet, 
@@ -37 +39 @@
                         
                 default:
-                        printf("unknown ethertype=%04x\n",ethertype);
+                        fprintf(stderr,"unknown ethertype=%04x\n",ethertype);
                         *proto=0;
                         return NULL;