aboutsummaryrefslogtreecommitdiffstats
path: root/epan/packet.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2005-07-24 19:01:28 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2005-07-24 19:01:28 +0000
commit220928b8c0d339ab78fc521ed604b1bc16b1ac54 (patch)
treeca1693ebf1407ac544cb272dbfe175ff1ff44a39 /epan/packet.c
parent42a1f83bcb20989d255b29b5c2620a16a1366ef0 (diff)
Constify to remove a bunch of warnings. Add some casts to squelch
(presumably-)harmless-but-otherwise-unremovable const-to-nonconst warnings. In the TACACS dissector, clean up the variables used in option parsing to avoid some const-to-nonconst warnings. Clean up some white space. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15043 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/packet.c b/epan/packet.c
index f47faeae63..bb33f54b88 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -937,7 +937,7 @@ dissector_add_string(const char *name, const gchar *pattern,
dtbl_entry->initial = dtbl_entry->current;
/* do the table insertion */
- g_hash_table_insert( sub_dissectors->hash_table, pattern,
+ g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern,
(gpointer)dtbl_entry);
/*
@@ -1417,7 +1417,7 @@ register_dissector_table(const char *name, const char *ui_name, ftenum_t type,
return sub_dissectors;
}
-char *
+const char *
get_dissector_table_ui_name(const char *name)
{
dissector_table_t sub_dissectors = find_dissector_table( name);
@@ -1583,7 +1583,7 @@ static GHashTable *registered_dissectors = NULL;
/* Get the short name of the protocol for a dissector handle, if it has
a protocol. */
-char *
+const char *
dissector_handle_get_short_name(dissector_handle_t handle)
{
if (handle->protocol == NULL) {
@@ -1758,7 +1758,7 @@ dissector_dump_decodes_display(gchar *table_name, ftenum_t selector_type _U_,
dtbl_entry_t *dtbl_entry;
dissector_handle_t handle;
gint proto_id;
- gchar *decode_as;
+ const gchar *decode_as;
g_assert(sub_dissectors);
switch (sub_dissectors->type) {