Changeset 952 for trunk/lib/trace.c

Timestamp:

08/25/06 15:47:43 (7 years ago)

Author:

perry

Message:

Fixed lots of warnings

File:

• trunk/lib/trace.c (modified) (11 diffs)

trunk/lib/trace.c

@@ -637 +637 @@
                 free(packet->buffer);
         }
-        packet->buf_control='\0'; /* an "bad" value to force an assert
-                                   * if this packet is ever reused
-                                   */
+        packet->buf_control=(buf_control_t)'\0'; 
+                                /* an "bad" value to force an assert
+                                 * if this packet is ever reused
+                                 */
         free(packet);
 }       
@@ -685 +686 @@
         }
         trace_set_err(libtrace,TRACE_ERR_UNSUPPORTED,"This format does not support reading packets\n");
-        packet->size=-1;
-        return -1;
+        packet->size=~0U;
+        return ~0U;
 }
 
@@ -832 +833 @@
                 return packet->trace->format->get_capture_length(packet);
         }
-        return -1;
+        return ~0U;
 }
         
@@ -850 +851 @@
                 return packet->trace->format->get_wire_length(packet);
         }
-        return -1;
+        return ~0U;
 
 }
@@ -867 +868 @@
                 return packet->trace->format->get_framing_length(packet);
         }
-        return -1;
+        return ~0U;
 }
 
@@ -975 +976 @@
                         return -1;
                 }
-                if (libtrace_to_pcap_dlt(linktype) == ~0U) {
+                if (libtrace_to_pcap_dlt(linktype) == -1) {
                         trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
                                         "Unknown pcap equivilent linktype");
@@ -1024 +1025 @@
 
         assert(filter->flag);
-        return bpf_filter(filter->filter.bf_insns, linkptr, clen, clen);
+        return bpf_filter(filter->filter.bf_insns,(u_char*)linkptr,clen,clen);
 #else
         fprintf(stderr,"This version of libtrace does not have bpf filter support\n");
@@ -1044 +1045 @@
                 return packet->trace->format->set_direction(packet,direction);
         }
-        return -1;
+        return (libtrace_direction_t)~0U;
 }
 
@@ -1063 +1064 @@
                 return packet->trace->format->get_direction(packet);
         }
-        return -1;
+        return (libtrace_direction_t)~0U;
 }
 
@@ -1079 +1080 @@
  * @param dest the TCP or UDP destination port
  * @returns a hint as to which port is the server port
- * @author Daniel Lawson
- */
-DLLEXPORT int8_t trace_get_server_port(uint8_t protocol UNUSED, uint16_t source, uint16_t dest) {
+ */
+DLLEXPORT int8_t trace_get_server_port(UNUSED uint8_t protocol, 
+                uint16_t source, uint16_t dest) 
+{
         /*
          * * If the ports are equal, return DEST
@@ -1203 +1205 @@
         }
 
-        return -1;
+        return ~0U;
 }