Changeset 1607

Timestamp:

07/16/10 14:36:48 (3 years ago)

Author:

salcock

Message:

• Make sure we include the header for read() and close()
• Remove seemingly useless function
• Re-enable probe_filename function
• Fix warning for unused parameter

File:

• trunk/lib/format_bpf.c (modified) (4 diffs)

trunk/lib/format_bpf.c

@@ -55 +55 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 /* This format deals with the BSD Native capture format, perhaps better
@@ -102 +103 @@
 }
 
-/* XXX This function doesn't appear to be used anywhere - nor does it do
- * anything particularly useful :) */
-static int bpf_start_filename(const char *filename)
-{
-        return 0;
-}
-
 /* Initialises a BPF input trace */
 static int bpf_init_input(libtrace_t *libtrace) 
@@ -448 +442 @@
 
 /* Returns the direction for a given BPF packet record */
-static libtrace_direction_t bpf_get_direction(const libtrace_packet_t *packet) {
+static libtrace_direction_t bpf_get_direction(const libtrace_packet_t *packet UNUSED) {
         /* BPF sadly can't do direction tagging */
         return ~0;
@@ -508 +502 @@
         "$Id$",
         TRACE_FORMAT_BPF,
-        //bpf_probe_filename,   /* probe filename */
-        NULL,
+        bpf_probe_filename,     /* probe filename */
         NULL,                   /* probe magic */
         bpf_init_input,         /* init_input */