From Xiao Xiangquan:

[obnox/wireshark/wip.git] / dftest.c

diff --git a/dftest.c b/dftest.c
index 7fbadd8bc70316743fd66f9628f527e7a95c8d16..c3f42f14f586ef0e043d7b1f50eb8ebb9b3103dc 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -32,10 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef NEED_STRERROR_H
-#include "strerror.h"
-#endif
-
 #include <glib.h>
 #include <epan/epan.h>
 
@@ -48,11 +44,9 @@
 #include "epan/dfilter/dfilter.h"
 #include "register.h"
 
-packet_info    pi;
-
 static void failure_message(const char *msg_format, va_list ap);
 static void open_failure_message(const char *filename, int err,
-    gboolean for_writing);
+       gboolean for_writing);
 static void read_failure_message(const char *filename, int err);
 static void write_failure_message(const char *filename, int err);
 
@@ -64,25 +58,24 @@ main(int argc, char **argv)
        char            *gpf_path, *pf_path;
        int             gpf_open_errno, gpf_read_errno;
        int             pf_open_errno, pf_read_errno;
-       e_prefs         *prefs;
        dfilter_t       *df;
 
        /*
         * Get credential information for later use.
         */
-       get_credential_info();
+       init_process_policies();
 
        /*
         * Attempt to get the pathname of the executable file.
         */
-       init_progfile_dir_error = init_progfile_dir(argv[0],
-           (const void *)main);
+       init_progfile_dir_error = init_progfile_dir(argv[0], main);
        if (init_progfile_dir_error != NULL) {
                fprintf(stderr, "dftest: Can't get pathname of dftest program: %s.\n",
-                   init_progfile_dir_error);
+                       init_progfile_dir_error);
        }
 
        timestamp_set_type(TS_RELATIVE);
+       timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
 
        /* Register all dissectors; we must do this before checking for the
           "-g" flag, as the "-g" flag dumps a list of fields registered
@@ -100,30 +93,30 @@ main(int argc, char **argv)
        /* set the c-language locale to the native environment. */
        setlocale(LC_ALL, "");
 
-       prefs = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
-           &pf_open_errno, &pf_read_errno, &pf_path);
+       read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
+               &pf_open_errno, &pf_read_errno, &pf_path);
        if (gpf_path != NULL) {
                if (gpf_open_errno != 0) {
                        fprintf(stderr,
-                           "can't open global preferences file \"%s\": %s.\n",
-                           pf_path, strerror(gpf_open_errno));
+                               "can't open global preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(gpf_open_errno));
                }
                if (gpf_read_errno != 0) {
                        fprintf(stderr,
-                           "I/O error reading global preferences file \"%s\": %s.\n",
-                           pf_path, strerror(gpf_read_errno));
+                               "I/O error reading global preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(gpf_read_errno));
                }
        }
        if (pf_path != NULL) {
                if (pf_open_errno != 0) {
                        fprintf(stderr,
-                           "can't open your preferences file \"%s\": %s.\n",
-                           pf_path, strerror(pf_open_errno));
+                               "can't open your preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(pf_open_errno));
                }
                if (pf_read_errno != 0) {
                        fprintf(stderr,
-                           "I/O error reading your preferences file \"%s\": %s.\n",
-                           pf_path, strerror(pf_read_errno));
+                               "I/O error reading your preferences file \"%s\": %s.\n",
+                               pf_path, g_strerror(pf_read_errno));
                }
        }
 
@@ -158,6 +151,7 @@ main(int argc, char **argv)
        else
                dfilter_dump(df);
 
+       dfilter_free(df);
        epan_cleanup();
        exit(0);
 }
@@ -191,7 +185,7 @@ static void
 read_failure_message(const char *filename, int err)
 {
        fprintf(stderr, "dftest: An error occurred while reading from the file \"%s\": %s.\n",
-           filename, strerror(err));
+               filename, g_strerror(err));
 }
 
 /*
@@ -201,5 +195,5 @@ static void
 write_failure_message(const char *filename, int err)
 {
        fprintf(stderr, "dftest: An error occurred while writing to the file \"%s\": %s.\n",
-           filename, strerror(err));
+               filename, g_strerror(err));
 }