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, 3 insertions, 8 deletions

diff --git a/tfshark.c b/tfshark.c
index e72645aedb..2dcd57385f 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -557,7 +557,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)
@@ -597,13 +597,8 @@ main(int argc, char *argv[])
     goto clean_exit;
   }
 
-  prefs_p = read_prefs();
-
-  /*
-   * Read the files that enable and disable protocols and heuristic
-   * dissectors.
-   */
-  read_enabled_and_disabled_lists();
+  /* Load libwireshark settings from the current profile. */
+  prefs_p = epan_load_settings();
 
   cap_file_init(&cfile);