Changeset ac96828 for lib/trace.c

Timestamp:

08/13/04 10:30:23 (18 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

82f2b7b

Parents:

299e9a0

Message:

more sensible ptr arithmetic

File:

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

lib/trace.c

@@ -479 +479 @@
 
         /* If we're reading from an ERF input, it's an offline trace. We can make some assumptions */
-        
+        
         if (libtrace->format == ERF) {
                 void *buffer2 = buffer;
@@ -494 +494 @@
                 size = ntohs(((dag_record_t *)buffer)->rlen) - sizeof(dag_record_t);
                 assert(size < LIBTRACE_PACKET_BUFSIZE);
-                buffer2 += sizeof(dag_record_t);
+                buffer2 = (ptrdiff_t)buffer +  sizeof(dag_record_t);
 
                 // read in the rest of the packet
@@ -506 +506 @@
                 return sizeof(dag_record_t) + numbytes;
         }
+        
         do {
                 if (fifo_out_available(libtrace->fifo) == 0 || read_required) {