diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-20 23:25:55 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-21 07:26:42 +0000 |
| commit | a138faf4252e4ac62b5835136de5b7b1064db7b3 (patch) | |
| tree | 722c36db5512405a380f1b3bb306e155162950ad /epan/packet.c | |
| parent | 806ebca6a557ed4c68c554a2ff6020e398728394 (diff) | |
Clean up some error messages.
Correct one message, change another one from a g_assert() to a g_error()
with descriptive text.
Change-Id: I667beb08ac1677205a9323ab623ed0a9766bac79
Reviewed-on: https://code.wireshark.org/review/5940
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/packet.c b/epan/packet.c index 6a4664eb92..79df326831 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1812,7 +1812,7 @@ register_dissector_table(const char *name, const char *ui_name, const ftenum_t t /* Make sure the registration is unique */ if(g_hash_table_lookup( dissector_tables, name )) { - g_error("The filter name %s (%s) is already registered - do you use a buggy plugin?", name, ui_name); + g_error("The dissector table %s (%s) is already registered - are you using a buggy plugin?", name, ui_name); } /* Create and register the dissector table for this name; returns */ @@ -2210,7 +2210,9 @@ register_heur_dissector_list(const char *name) heur_dissector_list_t sub_dissectors; /* Make sure the registration is unique */ - g_assert(g_hash_table_lookup(heur_dissector_lists, name) == NULL); + if (g_hash_table_lookup(heur_dissector_lists, name) != NULL) { + g_error("The heuristic dissector list %s is already registered - are you using a buggy plugin?", name); + } sub_dissectors = g_slice_new(struct heur_dissector_list); sub_dissectors->list = NULL; /* initially empty */ |