diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2017-03-19 12:26:28 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2017-03-19 12:27:12 +0000 |
| commit | 2890e415bbec3ddad7c0485067dd09f1e503c84f (patch) | |
| tree | 1500c8273b345db49f17b73a987be300290d7662 /capchild | |
| parent | 74e793e8bac3013f0474fdf398608ba24506307c (diff) | |
| download | wireshark-2890e415bbec3ddad7c0485067dd09f1e503c84f.tar.gz | |
Fix various compile warnings turning error on Linux with gcc6 when
compiling with HAVE_PCAP_REMOTE (and ENABLE_ECHLD)
Change-Id: If5524f2d3dcacca9c82a46167480c8436dd8b1b2
Reviewed-on: https://code.wireshark.org/review/20615
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'capchild')
| -rw-r--r-- | capchild/capture_ifinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 539857b9d5..e3773f512b 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -54,12 +54,12 @@ static GList * append_remote_list(GList *iflist) for (rlist = g_list_nth(remote_interface_list, 0); rlist != NULL; rlist = g_list_next(rlist)) { if_info = (if_info_t *)rlist->data; - temp = g_malloc0(sizeof(if_info_t)); + temp = (if_info_t*) g_malloc0(sizeof(if_info_t)); temp->name = g_strdup(if_info->name); temp->friendly_name = g_strdup(if_info->friendly_name); temp->vendor_description = g_strdup(if_info->vendor_description); for (list = g_slist_nth(if_info->addrs, 0); list != NULL; list = g_slist_next(list)) { - temp_addr = g_malloc0(sizeof(if_addr_t)); + temp_addr = (if_addr_t *) g_malloc0(sizeof(if_addr_t)); if_addr = (if_addr_t *)list->data; if (if_addr) { temp_addr->ifat_type = if_addr->ifat_type; @@ -350,12 +350,12 @@ void add_interface_to_remote_list(if_info_t *if_info) GSList *list; if_addr_t *if_addr, *temp_addr; - if_info_t *temp = g_malloc0(sizeof(if_info_t)); + if_info_t *temp = (if_info_t*) g_malloc0(sizeof(if_info_t)); temp->name = g_strdup(if_info->name); temp->friendly_name = g_strdup(if_info->friendly_name); temp->vendor_description = g_strdup(if_info->vendor_description); for (list = g_slist_nth(if_info->addrs, 0); list != NULL; list = g_slist_next(list)) { - temp_addr = g_malloc0(sizeof(if_addr_t)); + temp_addr = (if_addr_t *)g_malloc0(sizeof(if_addr_t)); if_addr = (if_addr_t *)list->data; if (if_addr) { temp_addr->ifat_type = if_addr->ifat_type; |