Changeset f3ed52a

Timestamp:

11/23/05 12:38:56 (16 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:

6342c18

Parents:

08f7fca

Message:

working with trace_event on pcapint
changed some decls inside the format_*.c functions - s/extern/static/

Location:

lib

Files:

• format_erf.c (modified) (3 diffs)
• format_pcap.c (modified) (2 diffs)
• format_template.c (modified) (1 diff)
• format_wag.c (modified) (1 diff)
• trace.c (modified) (1 diff)

lib/format_erf.c

@@ -63 +63 @@
 #include <stdlib.h>
 
+/*
+ gzread (gzFile, buf, len)
+ gzwrite(gzFile, buf, len)
+ gzdopen(path, mode)
+ gzclose(gzFile)
+
+ fread(ptr, size, num, FILE)
+ fwrite(ptr, size, num, FILE)
+ fopen(path, mode)
+ fdopen(fildes, mode)
+*/ 
 #if HAVE_ZLIB
 #  include <zlib.h>
 #  define LIBTRACE_READ gzread
+#  define LIBTRACE_OPEN gzopen
 #  define LIBTRACE_FDOPEN gzdopen
 #  define LIBTRACE_CLOSE gzclose
 #  define LIBTRACE_WRITE gzwrite
 #else
-#  define LIBTRACE_READ read
-#  define LIBTRACE_FDOPEN open
-#  define LIBTRACE_CLOSE close
-#  define LIBTRACE_WRITE write
+#  define LIBTRACE_READ fread
+#  define LIBTRACE_OPEN fopen
+#  define LIBTRACE_FDOPEN fdopen
+#  define LIBTRACE_CLOSE fclose
+#  define LIBTRACE_WRITE fwrite
 #endif
 
@@ -83 +96 @@
 #endif 
 
-extern struct libtrace_format_t erf;
-extern struct libtrace_format_t rtclient;
+static struct libtrace_format_t erf;
+static struct libtrace_format_t rtclient;
 #if HAVE_DAG
-extern struct libtrace_format_t dag;
+static struct libtrace_format_t dag;
 #endif 
-extern struct libtrace_format_t legacypos;
-extern struct libtrace_format_t legacyeth;
-extern struct libtrace_format_t legacyatm;
+static struct libtrace_format_t legacypos;
+static struct libtrace_format_t legacyeth;
+static struct libtrace_format_t legacyatm;
 
 #define CONNINFO libtrace->format_data->conn_info
@@ -113 +126 @@
                 gzFile *file;
 #else   
-                FILE *file;
+                FILE  *file;
 #endif
         } input;

lib/format_pcap.c

@@ -65 +65 @@
 
 #if HAVE_PCAP
-extern struct libtrace_format_t pcap;
-extern struct libtrace_format_t pcapint;
+static struct libtrace_format_t pcap;
+static struct libtrace_format_t pcapint;
 
 
@@ -468 +468 @@
         pcap_set_capture_length,        /* set_capture_length */
         pcap_get_fd,                    /* get_fd */
-        trace_event_device,             /* trace_event */
+        trace_event_trace,              /* trace_event */
         pcapint_help                    /* help */
 };

lib/format_template.c

@@ -41 +41 @@
 #endif 
 
-extern struct libtrace_format_t template;
+static struct libtrace_format_t template;
 
 struct libtrace_format_data_t {

lib/format_wag.c

@@ -88 +88 @@
 #endif
 
-extern struct libtrace_format_t wag;
+static struct libtrace_format_t wag;
 
 #define CONNINFO libtrace->format_data->conn_info

lib/trace.c

@@ -1095 +1095 @@
 struct libtrace_eventobj_t trace_event(struct libtrace_t *trace, 
                 struct libtrace_packet_t *packet) {
-        struct libtrace_eventobj_t event;
+        struct libtrace_eventobj_t event = {0,0,0.0,0};
 
         if (!trace) {