Changeset d8f02df for lib/trace.c

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!)

File:

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

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);