diff options
-rw-r--r-- | asn1/p1/packet-p1-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-p1.c | 2 | ||||
-rw-r--r-- | epan/packet.c | 4 | ||||
-rw-r--r-- | epan/proto.c | 8 | ||||
-rw-r--r-- | epan/wslua/wslua_pinfo.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index 8858abee70..d9a28d794d 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -112,7 +112,7 @@ static p1_address_ctx_t *get_do_address_ctx(asn1_ctx_t* actx) if (actx->pinfo->private_table) { /* First check if called from an extension attribute */ - ctx = (p1_address_ctx_t *)g_hash_table_lookup(actx->pinfo->private_table, (gpointer)P1_ADDRESS_CTX); + ctx = (p1_address_ctx_t *)g_hash_table_lookup(actx->pinfo->private_table, P1_ADDRESS_CTX); } if (!ctx) { diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 41603f3c05..c2dfc89363 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -915,7 +915,7 @@ static p1_address_ctx_t *get_do_address_ctx(asn1_ctx_t* actx) if (actx->pinfo->private_table) { /* First check if called from an extension attribute */ - ctx = (p1_address_ctx_t *)g_hash_table_lookup(actx->pinfo->private_table, (gpointer)P1_ADDRESS_CTX); + ctx = (p1_address_ctx_t *)g_hash_table_lookup(actx->pinfo->private_table, P1_ADDRESS_CTX); } if (!ctx) { diff --git a/epan/packet.c b/epan/packet.c index 0d810ee9a8..0e3c02b5f3 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -2156,7 +2156,7 @@ has_heur_dissector_list(const gchar *name) { heur_dtbl_entry_t* find_heur_dissector_by_unique_short_name(const char *short_name) { - return (heur_dtbl_entry_t*)g_hash_table_lookup(heuristic_short_names, (gpointer)short_name); + return (heur_dtbl_entry_t*)g_hash_table_lookup(heuristic_short_names, short_name); } void @@ -2205,7 +2205,7 @@ heur_dissector_add(const char *name, heur_dissector_t dissector, const char *dis } /* Ensure short_name is unique */ - if (g_hash_table_lookup(heuristic_short_names, (gpointer)short_name) != NULL) { + if (g_hash_table_lookup(heuristic_short_names, short_name) != NULL) { g_error("Duplicate heuristic short_name \"%s\"!" " This might be caused by an inappropriate plugin or a development error.", short_name); } diff --git a/epan/proto.c b/epan/proto.c index 783af76eea..396eac480d 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5321,7 +5321,7 @@ proto_register_protocol(const char *name, const char *short_name, } g_hash_table_insert(proto_names, key, (gpointer)name); - existing_protocol = (const protocol_t *)g_hash_table_lookup(proto_short_names, (gpointer)short_name); + existing_protocol = (const protocol_t *)g_hash_table_lookup(proto_short_names, short_name); if (existing_protocol != NULL) { g_error("Duplicate protocol short_name \"%s\"!" " This might be caused by an inappropriate plugin or a development error.", short_name); @@ -5339,7 +5339,7 @@ proto_register_protocol(const char *name, const char *short_name, " Allowed are lower characters, digits, '-', '_' and '.'." " This might be caused by an inappropriate plugin or a development error.", filter_name); } - existing_protocol = (const protocol_t *)g_hash_table_lookup(proto_filter_names, (gpointer)filter_name); + existing_protocol = (const protocol_t *)g_hash_table_lookup(proto_filter_names, filter_name); if (existing_protocol != NULL) { g_error("Duplicate protocol filter_name \"%s\"!" " This might be caused by an inappropriate plugin or a development error.", filter_name); @@ -5533,7 +5533,7 @@ proto_get_id_by_filter_name(const gchar *filter_name) DISSECTOR_ASSERT_HINT(filter_name, "No filter name present"); - protocol = (const protocol_t *)g_hash_table_lookup(proto_filter_names, (gpointer)filter_name); + protocol = (const protocol_t *)g_hash_table_lookup(proto_filter_names, filter_name); if (protocol == NULL) return -1; @@ -5547,7 +5547,7 @@ proto_get_id_by_short_name(const gchar *short_name) DISSECTOR_ASSERT_HINT(short_name, "No short name present"); - protocol = (const protocol_t *)g_hash_table_lookup(proto_short_names, (gpointer)short_name); + protocol = (const protocol_t *)g_hash_table_lookup(proto_short_names, short_name); if (protocol == NULL) return -1; diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 7484637e40..be095e679c 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -97,7 +97,7 @@ static int PrivateTable__index(lua_State* L) { const gchar* name = luaL_checkstring(L,2); const gchar* string; - string = (const gchar *)(g_hash_table_lookup (priv->table, (gpointer) name)); + string = (const gchar *)(g_hash_table_lookup (priv->table, name)); if (string) { lua_pushstring(L, string); |