Changeset 01818c6 for lib

Timestamp:

09/22/06 14:00:36 (16 years ago)

Author:

Shane Alcock <salcock@…>

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:

bed8c66

Parents:

52c7cda

Message:

Fixed warnings in format_rt
Stopped mallocing memory for a rt header read as the pointer will be changed to point into the rt buffer anyway

File:

• lib/format_rt.c (modified) (4 diffs)

lib/format_rt.c

@@ -242 +242 @@
                 return -1;
         }
+        RT_INFO->rt_hdr.type = RT_LAST;
 
         return 0;
@@ -288 +289 @@
 static int rt_read(libtrace_t *libtrace, void **buffer, size_t len, int block) {
         int numbytes;
-        rt_header_t *test_hdr;
         
         assert(len <= RT_BUF_SIZE);
@@ -486 +486 @@
 static int rt_read_packet_versatile(libtrace_t *libtrace,
                 libtrace_packet_t *packet,int blocking) {
-        static rt_header_t *pkt_hdr = 0;
-        
-        if (pkt_hdr == 0) {
-                /* first time through */
-                pkt_hdr = malloc(sizeof(rt_header_t));
-                RT_INFO->rt_hdr.type = RT_LAST;
-        }
-
-        /*
-        if (packet->buf_control == TRACE_CTRL_EXTERNAL || !packet->buffer) {
-                packet->buf_control = TRACE_CTRL_PACKET;
-                packet->buffer = malloc(LIBTRACE_PACKET_BUFSIZE);
-        } 
-        */
+        rt_header_t *pkt_hdr = NULL;
+        void *void_hdr;
+        
         if (packet->buf_control == TRACE_CTRL_PACKET) {
                 packet->buf_control = TRACE_CTRL_EXTERNAL;
@@ -509 +498 @@
          * rt header - I know it's hax and maybe I'll fix it later on */
         if (RT_INFO->rt_hdr.type == RT_LAST) {
-        
+                void_hdr = (void *)pkt_hdr;
+                
                 /* FIXME: Better error handling required */
-                if (rt_read(libtrace, (void **)&pkt_hdr, 
+                if (rt_read(libtrace, &void_hdr, 
                                 sizeof(rt_header_t),blocking) !=
                                 sizeof(rt_header_t)) {
                         return -1;
                 }
-
+                pkt_hdr = (rt_header_t *)void_hdr;
+                
                 /* Need to salvage these in case the next rt_read overwrites 
                  * the buffer they came from! */