forked from osmocom/wireshark
Fixed a few "statement not reached" warnings and a "assignment type mismatch" warning.
svn path=/trunk/; revision=24085
This commit is contained in:
parent
2df94e1092
commit
8b4e80384a
|
@ -494,7 +494,6 @@ static gchar *serv_name_lookup(guint port, port_type proto)
|
|||
/* not yet implemented */
|
||||
return NULL;
|
||||
/*NOTREACHED*/
|
||||
break;
|
||||
} /* proto */
|
||||
|
||||
hash_idx = HASH_PORT(port);
|
||||
|
|
|
@ -3338,16 +3338,12 @@ static GtkWidget *main_widget_layout(gint layout_content)
|
|||
switch(layout_content) {
|
||||
case(layout_pane_content_none):
|
||||
return NULL;
|
||||
break;
|
||||
case(layout_pane_content_plist):
|
||||
return pkt_scrollw;
|
||||
break;
|
||||
case(layout_pane_content_pdetails):
|
||||
return tv_scrollw;
|
||||
break;
|
||||
case(layout_pane_content_pbytes):
|
||||
return byte_nb_ptr;
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
return NULL;
|
||||
|
|
|
@ -516,7 +516,7 @@ read_set_recent_pair_dynamic(gchar *key, gchar *value, void *private_data _U_)
|
|||
int
|
||||
recent_set_arg(char *prefarg)
|
||||
{
|
||||
guchar *p, *colonp;
|
||||
gchar *p, *colonp;
|
||||
int ret;
|
||||
|
||||
colonp = strchr(prefarg, ':');
|
||||
|
|
3
tshark.c
3
tshark.c
|
@ -1011,7 +1011,6 @@ main(int argc, char *argv[])
|
|||
case 'L': /* Print list of link-layer types and exit */
|
||||
#ifdef HAVE_LIBPCAP
|
||||
list_link_layer_types = TRUE;
|
||||
break;
|
||||
#else
|
||||
capture_option_specified = TRUE;
|
||||
arg_error = TRUE;
|
||||
|
@ -2523,7 +2522,6 @@ write_preamble(capture_file *cf)
|
|||
|
||||
case WRITE_TEXT:
|
||||
return print_preamble(print_stream, cf ? cf->filename : NULL);
|
||||
break;
|
||||
|
||||
case WRITE_XML:
|
||||
if (verbose)
|
||||
|
@ -2868,7 +2866,6 @@ write_finale(void)
|
|||
|
||||
case WRITE_TEXT:
|
||||
return print_finale(print_stream);
|
||||
break;
|
||||
|
||||
case WRITE_XML:
|
||||
if (verbose)
|
||||
|
|
Loading…
Reference in New Issue