osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Squelch some compiler warnings. 

svn path=/trunk/; revision=32111
This commit is contained in:
Guy Harris 2010-03-04 09:37:05 +00:00
parent 25d49313cc
commit f05fb51aba
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
capture-pcap-util.c
View File

@ -183,7 +183,7 @@ if_info_new(char *name, char *description)
{
if_info_t *if_info;
if_info = g_malloc(sizeof (if_info_t));
if_info = (if_info_t *)g_malloc(sizeof (if_info_t));
if_info->name = g_strdup(name);
if (description == NULL)
if_info->description = NULL;
@ -207,7 +207,7 @@ if_info_add_address(if_info_t *if_info, struct sockaddr *addr)
case AF_INET:
ai = (struct sockaddr_in *)addr;
if_addr = g_malloc(sizeof(*if_addr));
if_addr = (if_addr_t *)g_malloc(sizeof(*if_addr));
if_addr->ifat_type = IF_AT_IPv4;
if_addr->addr.ip4_addr =
*((guint32 *)&(ai->sin_addr.s_addr));
@ -217,7 +217,7 @@ if_info_add_address(if_info_t *if_info, struct sockaddr *addr)
#ifdef INET6
case AF_INET6:
ai6 = (struct sockaddr_in6 *)addr;
if_addr = g_malloc(sizeof(*if_addr));
if_addr = (if_addr_t *)g_malloc(sizeof(*if_addr));
if_addr->ifat_type = IF_AT_IPv6;
memcpy((void *)&if_addr->addr.ip6_addr,
(void *)&ai6->sin6_addr.s6_addr,
@ -332,7 +332,7 @@ free_if_info_addr_cb(gpointer addr, gpointer user_data _U_)
static void
free_if_cb(gpointer data, gpointer user_data _U_)
{
if_info_t *if_info = data;
if_info_t *if_info = (if_info_t *)data;
g_free(if_info->name);
g_free(if_info->description);
@ -447,7 +447,7 @@ create_data_link_info(int dlt)
data_link_info_t *data_link_info;
const char *text;
data_link_info = g_malloc(sizeof (data_link_info_t));
data_link_info = (data_link_info_t *)g_malloc(sizeof (data_link_info_t));
data_link_info->dlt = dlt;
text = pcap_datalink_val_to_name(dlt);
if (text != NULL)
@ -546,7 +546,7 @@ get_pcap_linktype_list(const char *devname, char **err_str)
static void
free_linktype_cb(gpointer data, gpointer user_data _U_)
{
data_link_info_t *linktype_info = data;
data_link_info_t *linktype_info = (data_link_info_t *)data;
g_free(linktype_info->name);
g_free(linktype_info->description);

15
capture_opts.c
View File

@ -419,7 +419,7 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str
}
return 2;
}
if_info = g_list_nth_data(if_list, adapter_index - 1);
if_info = (if_info_t *)g_list_nth_data(if_list, adapter_index - 1);
if (if_info == NULL) {
cmdarg_err("There is no interface with that adapter index");
return 1;
@ -570,7 +570,8 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
int
capture_opts_list_link_layer_types(capture_options *capture_opts, gboolean machine_readable)
{
gchar *err_str, *desc_str;
gchar *err_str;
const gchar *desc_str;
GList *lt_list, *lt_entry;
data_link_info_t *data_link_info;
@ -588,7 +589,7 @@ capture_opts_list_link_layer_types(capture_options *capture_opts, gboolean machi
}
if (machine_readable) { /* tab-separated values to stdout */
for (lt_entry = lt_list; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) {
data_link_info = lt_entry->data;
data_link_info = (data_link_info_t *)lt_entry->data;
if (data_link_info->description != NULL)
desc_str = data_link_info->description;
else
@ -600,7 +601,7 @@ capture_opts_list_link_layer_types(capture_options *capture_opts, gboolean machi
cmdarg_err_cont("Data link types (use option -y to set):");
for (lt_entry = lt_list; lt_entry != NULL;
lt_entry = g_list_next(lt_entry)) {
data_link_info = lt_entry->data;
data_link_info = (data_link_info_t *)lt_entry->data;
cmdarg_err_cont(" %s", data_link_info->name);
if (data_link_info->description != NULL)
cmdarg_err_cont(" (%s)", data_link_info->description);
@ -647,7 +648,7 @@ capture_opts_list_interfaces(gboolean machine_readable)
i = 1; /* Interface id number */
for (if_entry = g_list_first(if_list); if_entry != NULL;
if_entry = g_list_next(if_entry)) {
if_info = if_entry->data;
if_info = (if_info_t *)if_entry->data;
printf("%d. %s", i++, if_info->name);
if (!machine_readable) {
@ -671,7 +672,7 @@ capture_opts_list_interfaces(gboolean machine_readable)
if (addr != g_slist_nth(if_info->addrs, 0))
printf(",");
if_addr = addr->data;
if_addr = (if_addr_t *)addr->data;
switch(if_addr->ifat_type) {
case IF_AT_IPv4:
if (inet_ntop(AF_INET, &if_addr->addr.ip4_addr, addr_str,
@ -764,7 +765,7 @@ gboolean capture_opts_trim_iface(capture_options *capture_opts, const char *capt
}
return FALSE;
}
if_info = if_list->data; /* first interface */
if_info = (if_info_t *)if_list->data; /* first interface */
capture_opts->iface = g_strdup(if_info->name);
/* We don't set iface_descr here because doing so requires
* capture_ui_utils.c which requires epan/prefs.c which is