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>

1 files changed, 4 insertions, 12 deletions

diff --git a/tshark.c b/tshark.c
index 6a7e345507..d8e70622a6 100644
--- a/tshark.c
+++ b/tshark.c
@@ -953,7 +953,7 @@ main(int argc, char *argv[])
       if (strcmp(argv[2], "column-formats") == 0)
         column_dump_column_formats();
       else if (strcmp(argv[2], "currentprefs") == 0) {
-        read_prefs();
+        epan_load_settings();
         write_prefs(NULL);
       }
       else if (strcmp(argv[2], "decodes") == 0)
@@ -1000,21 +1000,13 @@ main(int argc, char *argv[])
     goto clean_exit;
   }
 
-  /* load the decode as entries of this profile */
-  load_decode_as_entries();
+  tshark_debug("tshark reading settings");
 
-  tshark_debug("tshark reading preferences");
-
-  prefs_p = read_prefs();
+  /* Load libwireshark settings from the current profile. */
+  prefs_p = epan_load_settings();
 
   read_filter_list(CFILTER_LIST);
 
-  /*
-   * Read the files that enable and disable protocols and heuristic
-   * dissectors.
-   */
-  read_enabled_and_disabled_lists();
-
   cap_file_init(&cfile);
 
   /* Print format defaults to this. */