*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <glib.h>
-#include <epan/epan.h>
+#include <epan/epan.h>
#include <epan/timestamp.h>
-#include <epan/plugins.h>
-#include <epan/filesystem.h>
-#include <wsutil/privileges.h>
#include <epan/prefs.h>
+#include <epan/dfilter/dfilter.h>
+
+#include <wsutil/plugins.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/privileges.h>
+#include <wsutil/report_err.h>
+
#include "ui/util.h"
-#include "epan/dfilter/dfilter.h"
#include "register.h"
static void failure_message(const char *msg_format, va_list ap);
init_progfile_dir_error);
}
+ init_report_err(failure_message, open_failure_message,
+ read_failure_message, write_failure_message);
+
timestamp_set_type(TS_RELATIVE);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
"-g" flag, as the "-g" flag dumps a list of fields registered
by the dissectors, and we must do it before we read the preferences,
in case any dissectors register preferences. */
- epan_init(register_all_protocols,
- register_all_protocol_handoffs, NULL, NULL,
- failure_message, open_failure_message, read_failure_message,
- write_failure_message);
-
- /* now register the preferences for any non-dissector modules.
- we must do that before we read the preferences as well. */
- prefs_register_modules();
+ epan_init(register_all_protocols, register_all_protocol_handoffs,
+ NULL, NULL);
/* set the c-language locale to the native environment. */
setlocale(LC_ALL, "");
epan_cleanup();
exit(2);
}
- printf("dfilter ptr = 0x%08x\n", GPOINTER_TO_INT(df));
- printf("\n\n");
+ printf("\n");
if (df == NULL)
printf("Filter is empty\n");