diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-04-09 12:27:57 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-04-09 22:40:30 +0000 |
commit | 6b3714254d41f4e18ecc1df017804c9d94d21d9b (patch) | |
tree | b3fb664550e8d60dc19088f3002f1e53b1ef6e59 /sharkd.c | |
parent | 7d5ce06cbe35f3f818695c87e5b0f42172ee3784 (diff) |
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 <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'sharkd.c')
-rw-r--r-- | sharkd.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -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 |