Changeset d8f02df for lib

Timestamp:

02/27/06 16:53:10 (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:

5fb2251

Parents:

8a8e54b

Message:

Cleanup even more warnings (Finding a few bugs where functions don't always
call return!)

Location:

lib

Files:

• fifo.c (modified) (2 diffs)
• format_erf.c (modified) (1 diff)
• format_legacy.c (modified) (1 diff)
• format_pcap.c (modified) (3 diffs)
• format_rt.c (modified) (1 diff)
• format_wag.c (modified) (3 diffs)
• libtrace.h (modified) (3 diffs)
• trace.c (modified) (7 diffs)

lib/fifo.c

@@ -37 +37 @@
 #include <string.h> /* bzero */
 #include "fifo.h"
+#include "libtrace_int.h"
 
 #include <sys/types.h>
@@ -83 +84 @@
 
         if ((fifo->base = malloc(fifo->length)) == 0) {
-                trace_set_err(errno,"malloc failed");
                 return 0;
         }

lib/format_erf.c

@@ -555 +555 @@
                 dag_record_t *erfptr, int pad, void *buffer, size_t size) {
         int numbytes = 0;
-        assert(size>=0 && size<=65536);
+        assert(size<=65536);
         /* FIXME: Shouldn't this return != dag_record_size+pad on error? */
         if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, erfptr, dag_record_size + pad)) == 0) {

lib/format_legacy.c

@@ -152 +152 @@
                         packet->type = RT_DATA_LEGACY_ETH;
                         break;
+                default:
+                        assert(0);
         }
         

lib/format_pcap.c

@@ -161 +161 @@
         pcap_close(INPUT.pcap);
         INPUT.pcap=NULL;
+
+        return 0;
 }
 
@@ -260 +262 @@
         packet->payload = (void *)pcappkt;
 
-        assert(pcaphdr->caplen>=0 && pcaphdr->caplen<=65536);
+        assert(pcaphdr->caplen<=65536);
 }
 
@@ -388 +390 @@
         struct pcap_pkthdr *pcapptr = 0;
         pcapptr = (struct pcap_pkthdr *)packet->header;
-        assert(pcapptr->caplen>=0 && pcapptr->caplen<=65536);
+        assert(pcapptr->caplen<=65536);
         return pcapptr->caplen;
 }

lib/format_rt.c

@@ -374 +374 @@
                 struct libtrace_packet_t *packet) {
         
-        char buf[RP_BUFSIZE];
-        int read_required = 0;
         rt_header_t pkt_hdr;
-        char msg_buf[RP_BUFSIZE];
         int pkt_size = 0;
         

lib/format_wag.c

@@ -185 +185 @@
                         assert(OPTIONS.zlib.level>=0 
                                         && OPTIONS.zlib.level<=9);
-                        break;
+                        return 0;
 #else
                 case TRACE_OPTION_OUTPUT_COMPRESS:
@@ -204 +204 @@
 {
         close(INPUT.fd);
+
+        return 0;
 }
 
@@ -224 +226 @@
 
 static int wag_read(struct libtrace_t *libtrace, void *buffer, size_t len) {
-        int numbytes;
-        int framesize;
+        size_t framesize;
         char *buf_ptr = (char *)buffer;
         int to_read = 0;
         uint16_t magic = 0;
-        uint16_t lctr = 0;
 
         assert(libtrace);

lib/libtrace.h

@@ -765 +765 @@
  */
 SIMPLE_FUNCTION
-int trace_get_capture_length(const libtrace_packet_t *packet);
+size_t trace_get_capture_length(const libtrace_packet_t *packet);
 
 /** Get the size of the packet as it was seen on the wire.
@@ -774 +774 @@
  */ 
 SIMPLE_FUNCTION
-int trace_get_wire_length(const libtrace_packet_t *packet);
+size_t trace_get_wire_length(const libtrace_packet_t *packet);
 
 /** Get the length of the capture framing headers.
@@ -785 +785 @@
  */ 
 SIMPLE_FUNCTION
-int trace_get_framing_length(const libtrace_packet_t *packet);
+size_t trace_get_framing_length(const libtrace_packet_t *packet);
 
 /** Truncate ("snap") the packet at the suggested length

lib/trace.c

@@ -292 +292 @@
         libtrace->filter = NULL;
         libtrace->snaplen = 0;
+        libtrace->started=false;
 
         for (i = 0; i < nformats; i++) {
@@ -330 +331 @@
 
         libtrace->fifo = create_tracefifo(1048576);
+        if (!libtrace->fifo) {
+                trace_set_err(libtrace,ENOMEM,"Could not allocate memory for fifo");
+                free(scan);
+                return libtrace;
+        }
         assert(libtrace->fifo);
         free(scan);
-        libtrace->started=false;
         trace_set_err(libtrace,0,"");
         return libtrace;
@@ -594 +599 @@
         memcpy(dest->header,packet->header,trace_get_framing_length(packet));
         memcpy(dest->payload,packet->payload,trace_get_capture_length(packet));
+
+        return dest;
 }
 
@@ -631 +638 @@
                 do {
                         packet->size=libtrace->format->read_packet(libtrace,packet);
-                        if (packet->size==-1 || packet->size==0)
+                        if (packet->size==(size_t)-1 || packet->size==0)
                                 return packet->size;
                         if (libtrace->filter) {
@@ -1169 +1176 @@
 }
 
-int trace_get_capture_length(const struct libtrace_packet_t *packet) {
+size_t trace_get_capture_length(const libtrace_packet_t *packet) {
 
         assert(packet->size>0 && packet->size<65536);
@@ -1188 +1195 @@
  * not be the same as the Capture Len.
  */ 
-int trace_get_wire_length(const struct libtrace_packet_t *packet){
+size_t trace_get_wire_length(const libtrace_packet_t *packet){
         assert(packet->size>0 && packet->size<65536);
 
@@ -1207 +1214 @@
  */ 
 SIMPLE_FUNCTION
-int trace_get_framing_length(const libtrace_packet_t *packet) {
+size_t trace_get_framing_length(const libtrace_packet_t *packet) {
         if (packet->trace->format->get_framing_length) {
                 return packet->trace->format->get_framing_length(packet);