aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2020-10-13 18:48:46 -0700
committerGuy Harris <gharris@sonic.net>2020-10-14 04:51:45 +0000
commit6e6233521aa4f0e82b79219cb7e32912012d9ccf (patch)
tree1836305bf265c1aff78d61677343f3fa23bc2aac /mergecap.c
parent92e1b110f3f70d295adb10ce0dc5fad9a7189912 (diff)
Have WTAP_ERR_INTERNAL include an err_info string giving details.
That way, users won't just see "You got an internal error", the details will be given, so they can report them in a bug.
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c
index 6e8414dd20..94563a33a9 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -410,7 +410,8 @@ main(int argc, char *argv[])
break;
case MERGE_ERR_CANT_OPEN_OUTFILE:
- cfile_dump_open_failure_message("mergecap", out_filename, err, file_type);
+ cfile_dump_open_failure_message("mergecap", out_filename, err, err_info,
+ file_type);
break;
case MERGE_ERR_CANT_READ_INFILE:
@@ -430,7 +431,7 @@ main(int argc, char *argv[])
break;
case MERGE_ERR_CANT_CLOSE_OUTFILE:
- cfile_close_failure_message(out_filename, err);
+ cfile_close_failure_message(out_filename, err, err_info);
break;
default: