summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-20 11:23:51 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-20 18:24:20 +0000
commit9e9d284d9157a8b79964015be868f4e8c43274c3 (patch)
treebad43c0cd5b46eb04fd25ed9a5cf6f598d731391 /tshark.c
parentd09ef614598cf6b714059f39191f09af5701bc93 (diff)
downloadwireshark-9e9d284d9157a8b79964015be868f4e8c43274c3.tar.gz
Have separate routines for open-for-reading and open-for-writing errors.
Expand comments while we're at it. Change-Id: I6dcc791eab1c9e323a9572f3d54720d223bdd64b Reviewed-on: https://code.wireshark.org/review/21252 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/tshark.c b/tshark.c
index b25f80c03b..e3dc19add5 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1910,8 +1910,8 @@ main(int argc, char *argv[])
comment = g_strdup_printf("Dump of PDUs from %s", cf_name);
err = exp_pdu_open(&exp_pdu_tap_data, exp_fd, comment);
if (err != 0) {
- cfile_open_failure_message("TShark", exp_pdu_filename, err, NULL,
- TRUE, WTAP_FILE_TYPE_SUBTYPE_PCAPNG);
+ cfile_dump_open_failure_message("TShark", exp_pdu_filename, err,
+ WTAP_FILE_TYPE_SUBTYPE_PCAPNG);
g_free(comment);
exit_status = INVALID_EXPORT;
goto clean_exit;
@@ -3021,8 +3021,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
if (pdh == NULL) {
/* We couldn't set up to write to the capture file. */
- cfile_open_failure_message("TShark", save_file, err, NULL, TRUE,
- out_file_type);
+ cfile_dump_open_failure_message("TShark", save_file, err, out_file_type);
goto out;
}
} else {
@@ -3939,7 +3938,7 @@ cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_temp
return CF_OK;
fail:
- cfile_open_failure_message("TShark", fname, *err, err_info, FALSE, cf->cd_t);
+ cfile_open_failure_message("TShark", fname, *err, err_info);
return CF_ERROR;
}