diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-14 13:05:16 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-14 20:06:37 +0000 |
| commit | 6dd6fc9eff40e86aba1fb3aefa119b212ddd5504 (patch) | |
| tree | b05146e16bff5c3f044216e41d71f506fb904f41 | |
| parent | dcd3d7b2a5a592a058752187760e856a72b6fa6c (diff) | |
| download | wireshark-6dd6fc9eff40e86aba1fb3aefa119b212ddd5504.tar.gz | |
Make prefs_register_module() static.
It's not used outside epan/prefs.c, and it *shouldn't* be used outside
epan/prefs.c - there are other APIs that call it, and handle the details
of picking the right name, title, description, etc..
Change-Id: Ib95b4811d50c2bf1c480f115ee998274252243c9
Reviewed-on: https://code.wireshark.org/review/21095
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | debian/libwireshark0.symbols | 1 | ||||
| -rw-r--r-- | epan/prefs.c | 2 | ||||
| -rw-r--r-- | epan/prefs.h | 18 |
3 files changed, 1 insertions, 20 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index 1f526cfa9d..5255bde590 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -993,7 +993,6 @@ libwireshark.so.0 libwireshark0 #MINVER# prefs_register_directory_preference@Base 1.9.1 prefs_register_enum_preference@Base 1.9.1 prefs_register_filename_preference@Base 1.9.1 - prefs_register_module@Base 2.1.0 prefs_register_obsolete_preference@Base 1.9.1 prefs_register_protocol@Base 1.9.1 prefs_register_protocol_subtree@Base 1.9.1 diff --git a/epan/prefs.c b/epan/prefs.c index af8492b8e9..7d1ac2ae5a 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -419,7 +419,7 @@ prefs_cleanup(void) * the title used in the tab for it in a preferences dialog box, and a * routine to call back when we apply the preferences. */ -module_t * +static module_t * prefs_register_module(module_t *parent, const char *name, const char *title, const char *description, void (*apply_cb)(void), const gboolean use_gui) diff --git a/epan/prefs.h b/epan/prefs.h index 1f9f38a41d..cd88dac9b4 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -270,24 +270,6 @@ WS_DLL_PUBLIC void prefs_reset(void); void prefs_cleanup(void); /* - * Register a module that will have preferences. - * Specify the module under which to register it or NULL to register it - * at the top level, the name used for the module in the preferences file, - * the title used in the tab for it in a preferences dialog box, a - * routine to call back when we apply the preferences, and if it should - * use the GUI controls provided by the preferences or it has its own. - * - * This should not be used for dissector preferences; - * "prefs_register_protocol()" should be used for that, so that the - * preferences go under the "Protocols" subtree, and so that the - * name is the protocol name specified at the "proto_register_protocol()" - * call so that the "Protocol Properties..." menu item works. - */ -WS_DLL_PUBLIC module_t *prefs_register_module(module_t *parent, const char *name, - const char *title, const char *description, void (*apply_cb)(void), - const gboolean use_gui); - -/* * Register a subtree that will have modules under it. * Specify the module under which to register it or NULL to register it * at the top level and the title used in the tab for it in a preferences |