diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-02 19:38:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-03 02:39:01 +0000 |
| commit | 21082d67ad446ccad9d60c3ed60d663009fc6f89 (patch) | |
| tree | d5c5d6ed18664f0b64f0a83403de149ecc8ddd87 /editcap.c | |
| parent | 53ed67c3086bffe509d89cffc2c0cf6026775857 (diff) | |
| download | wireshark-21082d67ad446ccad9d60c3ed60d663009fc6f89.tar.gz wireshark-21082d67ad446ccad9d60c3ed60d663009fc6f89.tar.bz2 wireshark-21082d67ad446ccad9d60c3ed60d663009fc6f89.zip | |
Pass the file type, not the frame type, to cfile_dump_open_failure_message().
Change-Id: I3c5e73d4e13106891001dfccd1568148a06329b4
Reviewed-on: https://code.wireshark.org/review/21909
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit ae409ed545efd297d69378a6a612bfe2baa8c924)
Reviewed-on: https://code.wireshark.org/review/21910
Diffstat (limited to 'editcap.c')
| -rw-r--r-- | editcap.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1424,7 +1424,8 @@ main(int argc, char *argv[]) if (pdh == NULL) { cfile_dump_open_failure_message("editcap", filename, - write_err, out_frame_type); + write_err, + out_file_type_subtype); ret = INVALID_FILE; goto clean_exit; } @@ -1466,7 +1467,7 @@ main(int argc, char *argv[]) if (pdh == NULL) { cfile_dump_open_failure_message("editcap", filename, write_err, - out_frame_type); + out_file_type_subtype); ret = INVALID_FILE; goto clean_exit; } @@ -1496,7 +1497,7 @@ main(int argc, char *argv[]) if (pdh == NULL) { cfile_dump_open_failure_message("editcap", filename, write_err, - out_frame_type); + out_file_type_subtype); ret = INVALID_FILE; goto clean_exit; } @@ -1810,7 +1811,7 @@ main(int argc, char *argv[]) if (pdh == NULL) { cfile_dump_open_failure_message("editcap", filename, write_err, - out_frame_type); + out_file_type_subtype); ret = INVALID_FILE; goto clean_exit; } |