From Irene Ruengeler: Whitespace changes.

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

diff --git a/dftest.c b/dftest.c
index 2f3ced581affb5a7166df2ccbe1411ecde0580ed..939f77be11f6eab03e2d9c3bbe8055ead4ab93cd 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>
 
@@ -44,7 +40,7 @@
 #include <epan/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/prefs.h>
-#include "util.h"
+#include "ui/util.h"
 #include "epan/dfilter/dfilter.h"
 #include "register.h"
 
@@ -62,13 +58,12 @@ 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_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 +75,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,30 +93,30 @@ main(int argc, char **argv)
        /* set the c-language locale to the native environment. */
        setlocale(LC_ALL, "");
 
-       prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_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));
+                               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));
+                               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));
+                               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));
+                               pf_path, g_strerror(pf_read_errno));
                }
        }
 
@@ -189,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));
 }
 
 /*
@@ -199,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));
 }