From 6b3714254d41f4e18ecc1df017804c9d94d21d9b Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 9 Apr 2017 12:27:57 -0700 Subject: Pull all the "load settings" calls into a epan_load_settings() routine. That way, nothing using libwireshark needs to know what settings need to be loaded, they just call epan_load_settings(). Change-Id: I9390e259e286fc4f5acaeaac2767e4c3c4b656af Reviewed-on: https://code.wireshark.org/review/20983 Petri-Dish: Guy Harris Reviewed-by: Guy Harris --- sharkd.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'sharkd.c') diff --git a/sharkd.c b/sharkd.c index 3b10e89f79..712e73117d 100644 --- a/sharkd.c +++ b/sharkd.c @@ -201,10 +201,8 @@ main(int argc, char *argv[]) goto clean_exit; } - /* load the decode as entries of this profile */ - load_decode_as_entries(); - - prefs_p = read_prefs(); + /* Load libwireshark settings from the current profile. */ + prefs_p = epan_load_settings(); read_filter_list(CFILTER_LIST); @@ -213,12 +211,6 @@ main(int argc, char *argv[]) g_free(err_msg); } - /* - * Read the files that enable and disable protocols and heuristic - * dissectors. - */ - read_enabled_and_disabled_lists(); - cap_file_init(&cfile); /* Notify all registered modules that have had any of their preferences -- cgit v1.2.3