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 /epan/prefs.h | |
| 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 'epan/prefs.h')
| -rw-r--r-- | epan/prefs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/prefs.h b/epan/prefs.h index 77a3624ff5..1f9f38a41d 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -590,8 +590,11 @@ char *prefs_pref_to_str(pref_t *pref, pref_source_t source); /* Read the preferences file, fill in "prefs", and return a pointer to it. If we got an error (other than "it doesn't exist") we report it through - the UI. */ -WS_DLL_PUBLIC e_prefs *read_prefs(void); + the UI. + + This is called by epan_load_settings(); programs should call that + rather than individually calling the routines it calls. */ +extern e_prefs *read_prefs(void); /* Write out "prefs" to the user's preferences file, and return 0. |