Changeset 9e830d4

Timestamp:

04/08/06 17:34:32 (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:

dd4b39b

Parents:

f2f47a7

Message:

More portability/warnings fixed

Location:

lib

Files:

• common.h (modified) (1 diff)
• fifo.c (modified) (1 diff)
• format_erf.c (modified) (2 diffs)
• libtrace_int.h (modified) (1 diff)

lib/common.h

@@ -30 +30 @@
 #  define LIBTRACE_FILE int
 #  define LIBTRACE_SEEK(file,offset,whence) lseek(file,offset,whence)
-#  define LIBTRACE_TELL(file) tell(file,0,SEEK_CUR)
+#  define LIBTRACE_TELL(file) lseek(file,0,SEEK_CUR)
 #endif
 

lib/fifo.c

@@ -35 +35 @@
 #include <stdio.h> /* sprintf, printf */
 #include <assert.h> /* assert */
+#include <string.h> /* memset / memcpy */
 #include "libtrace_int.h"
 

lib/format_erf.c

@@ -197 +197 @@
         libtrace->format_data = malloc(sizeof(struct erf_format_data_t));
         
-        INPUT.file = NULL;
+        INPUT.file = 0;
 
         return 0; /* success */
@@ -391 +391 @@
 }
 
-static int erf_config_output(libtrace_out_t *libtrace, trace_option_t option, void *value) {
+static int erf_config_output(libtrace_out_t *libtrace, trace_option_output_t option,
+                void *value) {
 
         switch (option) {

lib/libtrace_int.h

@@ -189 +189 @@
         int (*init_output)(libtrace_out_t *libtrace);
         /** configure output traces (or NULL if output not supported) */
-        int (*config_output)(libtrace_out_t *libtrace, trace_option_output_t, void *);
+        int (*config_output)(libtrace_out_t *libtrace, trace_option_output_t option, void *);
         /** start output traces (or NULL if output not supported) 
          * There is no pause for output traces, as packets are not arriving