Changeset 162d976

Timestamp:

06/14/06 11:01:38 (15 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:

430077b

Parents:

1bd63d6

Message:

tracemerge now uses trace_perror_output when an output trace errors
Fixed warning due to duck_get_linktype returning an int rather than libtrace_linktype_t

Files:

• lib/format_duck.c (modified) (1 diff)
• tools/tracemerge/tracemerge.c (modified) (1 diff)

lib/format_duck.c

@@ -248 +248 @@
 }
 
-static int duck_get_link_type(const libtrace_packet_t *packet) {
+static libtrace_linktype_t duck_get_link_type(const libtrace_packet_t *packet) {
         return TRACE_TYPE_DUCK;
 }

tools/tracemerge/tracemerge.c

@@ -127 +127 @@
 
                 if (trace_write_packet(output,packet[oldest]) < 0) {
-                        trace_perror(output, "trace_write_packet");
+                        trace_perror_output(output, "trace_write_packet");
                         break;
                 }