This should fix the "else without previous if" error reported by Joerg.
svn path=/trunk/; revision=38375
This commit is contained in:
parent
ecdd812a6d
commit
84b0d41dcf
|
@ -775,8 +775,7 @@ void insert_new_rows(GList *list)
|
||||||
str = g_strdup_printf("%s (not supported)", data_link_info->name);
|
str = g_strdup_printf("%s (not supported)", data_link_info->name);
|
||||||
link->pointer = -1;
|
link->pointer = -1;
|
||||||
}
|
}
|
||||||
if (g_ascii_strcasecmp(first, "") == 0)
|
if (g_ascii_strcasecmp(first, "") == 0) {
|
||||||
{
|
|
||||||
first = g_strdup_printf("%s",str);
|
first = g_strdup_printf("%s",str);
|
||||||
}
|
}
|
||||||
link->link_type = g_strdup(str);
|
link->link_type = g_strdup(str);
|
||||||
|
@ -784,22 +783,19 @@ void insert_new_rows(GList *list)
|
||||||
linktype_count++;
|
linktype_count++;
|
||||||
} /* for link_types */
|
} /* for link_types */
|
||||||
} /* caps != NULL */
|
} /* caps != NULL */
|
||||||
#ifdef HAVE_PCAP_CREATE
|
#if defined(HAVE_PCAP_CREATE) || defined(HAVE_PCAP_REMOTE)
|
||||||
else {
|
else {
|
||||||
/* We don't know whether this supports monitor mode or not;
|
/* We don't know whether this supports monitor mode or not;
|
||||||
don't ask for monitor mode. */
|
don't ask for monitor mode. */
|
||||||
cap_settings.monitor_mode = FALSE;
|
cap_settings.monitor_mode = FALSE;
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_PCAP_REMOTE
|
#ifdef HAVE_PCAP_REMOTE
|
||||||
else {
|
|
||||||
link = (link_row *)g_malloc(sizeof(link_row));
|
link = (link_row *)g_malloc(sizeof(link_row));
|
||||||
cap_settings.monitor_mode = FALSE;
|
|
||||||
row.monitor_mode = FALSE;
|
row.monitor_mode = FALSE;
|
||||||
link->pointer = 1;
|
link->pointer = 1;
|
||||||
link->link_type = g_strdup("Ethernet");
|
link->link_type = g_strdup("Ethernet");
|
||||||
row.active_dlt = 1;
|
row.active_dlt = 1;
|
||||||
row.links = g_list_append(row.links, link);
|
row.links = g_list_append(row.links, link);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (ips == 0) {
|
if (ips == 0) {
|
||||||
|
|
Loading…
Reference in New Issue