diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-12-17 20:03:47 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-12-18 04:04:19 +0000 |
commit | 0885d2945103236f7f475963f66048291f0b18f1 (patch) | |
tree | 2c165dd89f97ee9cc33d39f9b7a62840e0ab269b /mergecap.c | |
parent | 6011a047d3cd2aba84e7fdd3bf7e8403a2f3563b (diff) |
Make sure err_info is always set, and print it iff it's non-null.
Change-Id: Ib5c600c491a3d8adcfa91c00fa9445283610545b
Reviewed-on: https://code.wireshark.org/review/5830
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
-rw-r--r-- | mergecap.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/mergecap.c b/mergecap.c index 82b26403e7..7bcada4f99 100644 --- a/mergecap.c +++ b/mergecap.c @@ -374,13 +374,9 @@ main(int argc, char *argv[]) &open_err, &err_info, &err_fileno)) { fprintf(stderr, "mergecap: Can't open %s: %s\n", argv[optind + err_fileno], wtap_strerror(open_err)); - switch (open_err) { - - case WTAP_ERR_UNSUPPORTED: - case WTAP_ERR_BAD_FILE: + if (err_info != NULL) { fprintf(stderr, "(%s)\n", err_info); g_free(err_info); - break; } return 2; } @@ -542,13 +538,9 @@ main(int argc, char *argv[]) if (in_files[i].state == GOT_ERROR) { fprintf(stderr, "mergecap: Error reading %s: %s\n", in_files[i].filename, wtap_strerror(read_err)); - switch (read_err) { - - case WTAP_ERR_UNSUPPORTED: - case WTAP_ERR_BAD_FILE: + if (err_info != NULL) { fprintf(stderr, "(%s)\n", err_info); g_free(err_info); - break; } } } @@ -599,7 +591,7 @@ main(int argc, char *argv[]) fprintf(stderr, "mergecap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n", in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN", wtap_file_type_subtype_string(file_type), - write_err_info); + write_err_info != NULL ? write_err_info : "no information supplied"); g_free(write_err_info); break; |