diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
| commit | 3eb06be97d520daef0bad19bf9c261b01abdc66d (patch) | |
| tree | 521ce26d4bc68c8e4158df7aa2af769ba60e93b9 /epan/dissectors/packet-llc.c | |
| parent | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48425
Diffstat (limited to 'epan/dissectors/packet-llc.c')
| -rw-r--r-- | epan/dissectors/packet-llc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 4de3502c8a..3afdfbf139 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -262,7 +262,7 @@ llc_add_oui(guint32 oui, const char *table_name, const char *table_ui_name, { oui_info_t *new_info; - new_info = g_malloc(sizeof (oui_info_t)); + new_info = (oui_info_t *)g_malloc(sizeof (oui_info_t)); new_info->table = register_dissector_table(table_name, table_ui_name, FT_UINT16, BASE_HEX); new_info->field_info = hf_item; @@ -782,7 +782,7 @@ oui_info_t * get_snap_oui_info(guint32 oui) { if (oui_info_table != NULL) { - return g_hash_table_lookup(oui_info_table, + return (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui)); } else return NULL; @@ -924,7 +924,7 @@ proto_register_basicxid(void) static void register_hf(gpointer key _U_, gpointer value, gpointer user_data _U_) { - oui_info_t *info = value; + oui_info_t *info = (oui_info_t *)value; proto_register_field_array(proto_llc, info->field_info, 1); } |