Changeset 4746c71

Timestamp:

12/31/06 17:49:49 (15 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:

8d504c1

Parents:

e1868fb

Message:

Lots of tiny little warning fixes. Mostly related to casts

Location:

lib

Files:

• format_pcapfile.c (modified) (2 diffs)
• format_rt.c (modified) (3 diffs)
• format_wag.c (modified) (1 diff)
• libtrace_int.h (modified) (1 diff)
• linktypes.c (modified) (2 diffs)

lib/format_pcapfile.c

@@ -353 +353 @@
                 {
                         libtrace_sll_header_t *sll;
-                        sll = trace_get_link(packet);
+                        sll = (libtrace_sll_header_t*)trace_get_link(packet);
                         if (!sll) {
                                 trace_set_err(packet->trace,
@@ -382 +382 @@
                 {
                         libtrace_pflog_header_t *pflog;
-                        pflog = trace_get_link(packet);
+                        pflog=(libtrace_pflog_header_t*)trace_get_link(packet);
                         if (!pflog) {
                                 trace_set_err(packet->trace,

lib/format_rt.c

@@ -53 +53 @@
 #define RT_INFO ((struct rt_format_data_t*)libtrace->format_data)
 
-static char *rt_deny_reason(enum rt_conn_denied_t reason) 
+static const char *rt_deny_reason(enum rt_conn_denied_t reason) 
 {
-        char *string = 0;
+        const char *string = 0;
 
         switch(reason) {
@@ -294 +294 @@
         
         if (!RT_INFO->pkt_buffer) {
-                RT_INFO->pkt_buffer = malloc((size_t)RT_BUF_SIZE);
+                RT_INFO->pkt_buffer = (char*)malloc((size_t)RT_BUF_SIZE);
                 RT_INFO->buf_current = RT_INFO->pkt_buffer;
                 RT_INFO->buf_filled = 0;
@@ -448 +448 @@
         
         if (!ack_buffer) {
-                ack_buffer = malloc(sizeof(rt_header_t) + sizeof(rt_ack_t));
+                ack_buffer = (char*)malloc(sizeof(rt_header_t) 
+                                                        + sizeof(rt_ack_t));
         }
         

lib/format_wag.c

@@ -292 +292 @@
         assert(framesize<=len);
 
-        buf_ptr = (void*)((char*)buffer + sizeof (struct frame_t));
+        buf_ptr = ((char*)buffer + sizeof (struct frame_t));
         to_read = framesize - sizeof(struct frame_t);
         

lib/libtrace_int.h

@@ -196 +196 @@
 struct libtrace_format_t {
         /** the uri name of this module */
-        char *name;
+        const char *name;
         /** the version of this module */
-        char *version;
+        const char *version;
         /** the RT protocol type of this module */
         enum base_format_t type;

lib/linktypes.c

@@ -246 +246 @@
                                 packet->payload,NULL,&remaining);
 
-                        tmp=malloc(
+                        tmp=(char*)malloc(
                                 trace_get_capture_length(packet)
                                 +sizeof(libtrace_pcapfile_pkt_hdr_t)
@@ -285 +285 @@
                                 packet->payload,&type,&remaining);
 
-                        tmp=malloc(
+                        tmp=(char*)malloc(
                                 trace_get_capture_length(packet)
                                 +sizeof(libtrace_pcapfile_pkt_hdr_t)