tfshark: Enable -Werror and fix compiler warnings
Fix a -Wunreachable warning.
This commit is contained in:
parent
cfbe898dcc
commit
5754fdf289
|
@ -3711,6 +3711,7 @@ set(CLEAN_C_FILES
|
||||||
${dumpcap_FILES}
|
${dumpcap_FILES}
|
||||||
${wireshark_FILES}
|
${wireshark_FILES}
|
||||||
${tshark_FILES}
|
${tshark_FILES}
|
||||||
|
${tfshark_FILES}
|
||||||
${rawshark_FILES}
|
${rawshark_FILES}
|
||||||
${dftest_FILES}
|
${dftest_FILES}
|
||||||
${randpkt_FILES}
|
${randpkt_FILES}
|
||||||
|
|
11
tfshark.c
11
tfshark.c
|
@ -2014,11 +2014,8 @@ write_finale(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
cf_status_t
|
cf_status_t
|
||||||
cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_tempfile, int *err)
|
cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_tempfile, int *err _U_)
|
||||||
{
|
{
|
||||||
gchar *err_info;
|
|
||||||
char err_msg[2048+1];
|
|
||||||
|
|
||||||
/* The open isn't implemented yet. Fill in the information for this file. */
|
/* The open isn't implemented yet. Fill in the information for this file. */
|
||||||
|
|
||||||
/* Create new epan session for dissection. */
|
/* Create new epan session for dissection. */
|
||||||
|
@ -2055,10 +2052,14 @@ cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_temp
|
||||||
return CF_OK;
|
return CF_OK;
|
||||||
|
|
||||||
/* fail: */
|
/* fail: */
|
||||||
|
/*
|
||||||
|
gchar *err_info;
|
||||||
|
char err_msg[2048+1];
|
||||||
snprintf(err_msg, sizeof err_msg,
|
snprintf(err_msg, sizeof err_msg,
|
||||||
cf_open_error_message(*err, err_info, FALSE, cf->cd_t), fname);
|
cf_open_error_message(*err, err_info, FALSE, cf->cd_t), fname);
|
||||||
cmdarg_err("%s", err_msg);
|
cmdarg_err("%s", err_msg);
|
||||||
return CF_ERROR;
|
return CF_ERROR;
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2085,7 +2086,7 @@ show_print_file_io_error(int err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
static const char * _U_
|
||||||
cf_open_error_message(int err, gchar *err_info _U_, gboolean for_writing,
|
cf_open_error_message(int err, gchar *err_info _U_, gboolean for_writing,
|
||||||
int file_type _U_)
|
int file_type _U_)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue