osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Crashing in proto_initialize_all_prefixes()? Debugging output. 

Change-Id: I6db711b1730b95460983ee190762753198c1959e
Reviewed-on: https://code.wireshark.org/review/17409
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-08-30 20:03:42 -07:00
parent 18a873d576
commit 1512ee7d84
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/proto.c
View File

@ -889,6 +889,7 @@ void
proto_register_prefix(const char *prefix, prefix_initializer_t pi ) {
if (! prefixes ) {
prefixes = g_hash_table_new(prefix_hash, prefix_equal);
fprintf(stderr, "Created prefixes hash table: %p\n", prefixes);
}
g_hash_table_insert(prefixes, (gpointer)prefix, (gpointer)pi);
@ -904,6 +905,7 @@ initialize_prefix(gpointer k, gpointer v, gpointer u _U_) {
/** Initialize every remaining uninitialized prefix. */
void
proto_initialize_all_prefixes(void) {
fprintf(stderr, "proto_initialize_all_prefixes(): prefixes %p\n", prefixes);
g_hash_table_foreach_remove(prefixes, initialize_prefix, NULL);
}

8
tshark.c
View File

@ -829,18 +829,11 @@ main(int argc, char *argv[])
XXX - we do this here, for now, to support "-G" with no arguments.
If none of our build or other processes uses "-G" with no arguments,
we can just process it with the other arguments. */
fprintf(stderr, "Checking for -G\n");
if (argc >= 2 && strcmp(argv[1], "-G") == 0) {
fprintf(stderr, "-G detected\n");
proto_initialize_all_prefixes();
fprintf(stderr, "proto_initialize_all_prefixes() returned\n");
if (argc == 2)
{
fprintf(stderr, "calling proto_registrar_dump_fields()\n");
proto_registrar_dump_fields();
fprintf(stderr, "proto_registrar_dump_fields() returned\n");
}
else {
if (strcmp(argv[2], "column-formats") == 0)
column_dump_column_formats();
@ -885,7 +878,6 @@ fprintf(stderr, "proto_registrar_dump_fields() returned\n");
return 1;
}
}
fprintf(stderr, "About to return\n");
return 0;
}