The Styleguide section has been moved to the Wireshark Developer's Guide.

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

diff --git a/dftest.c b/dftest.c
index 2aae57cc094d1a3bc50af02c4668d5fbb2adec4e..5d82b6374b4a90ad0f7f48c7f7f4bf44dc66031d 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -33,7 +33,7 @@
 #include <errno.h>
 
 #ifdef NEED_STRERROR_H
-#include "strerror.h"
+#include "wsutil/strerror.h"
 #endif
 
 #include <glib.h>
@@ -62,13 +62,13 @@ 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;
+       e_prefs         *prefs_p;
        dfilter_t       *df;
 
        /*
         * Get credential information for later use.
         */
-       get_credential_info();
+       init_process_policies();
 
        /*
         * Attempt to get the pathname of the executable file.
@@ -80,6 +80,7 @@ main(int argc, char **argv)
        }
 
        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
@@ -97,7 +98,7 @@ 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,
+       prefs_p = 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) {