diff options
| -rw-r--r-- | epan/address.h | 2 | ||||
| -rw-r--r-- | gtk/voip_calls.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/epan/address.h b/epan/address.h index c75a3c8000..a977aee045 100644 --- a/epan/address.h +++ b/epan/address.h @@ -57,7 +57,7 @@ typedef struct _address { #define SET_ADDRESS(addr, addr_type, addr_len, addr_data) { \ (addr)->type = (addr_type); \ (addr)->len = (addr_len); \ - (addr)->data = (addr_data); \ + (addr)->data = (void *)(addr_data); \ } /* diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index a2bf71a6a2..60b0fc5f34 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -1311,9 +1311,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co list = g_list_next (list); } - pstn_add.type = AT_STRINGZ; - pstn_add.len = 5; - pstn_add.data = g_strdup("PSTN"); + SET_ADDRESS(&pstn_add, AT_STRINGZ, 5, g_strdup("PSTN")); /* if it is a new call, add it to the list */ if (!strinfo) { @@ -2367,9 +2365,7 @@ ACTRACEcalls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, list = g_list_next (list); } - pstn_add.type = AT_STRINGZ; - pstn_add.len = 5; - pstn_add.data = g_strdup("PSTN"); + SET_ADDRESS(&pstn_add, AT_STRINGZ, 5, g_strdup("PSTN")); /* if it is a new call, add it to the list */ if (!strinfo) { |