diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-20 13:25:21 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-20 20:25:59 +0000 |
| commit | 64ec2b2e5ed590a6f1a3d22c8b24a6e70420d1f9 (patch) | |
| tree | aab752fe44790898535c850d89e015b75b569149 /ui/alert_box.h | |
| parent | 2e6cb9dbab154531b306e472642ff6033f0e341c (diff) | |
Take the error message generation out of the merge_files routines.
Have them just return the information needed for the caller to produce
an error message, and have the callers use the new cfile_ routines for
reporting errors.
This requires that the "write failure alert box" routine take the
*input* file name as an argument, so that, on a merge, if the problem is
that a record from a given input file can't be written out to the type
of output file we're generating, the input file name can be given, along
with the record number in that file.
Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71
Reviewed-on: https://code.wireshark.org/review/21257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/alert_box.h')
| -rw-r--r-- | ui/alert_box.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ui/alert_box.h b/ui/alert_box.h index 74d3261474..5d392e7107 100644 --- a/ui/alert_box.h +++ b/ui/alert_box.h @@ -69,15 +69,19 @@ extern void cfile_read_failure_alert_box(const char *filename, int err, /* * Alert box for a failed attempt to write to a capture file. - * "err" is assumed to be a UNIX-style errno or a WTAP_ERR_ value; - * "err_info" is assumed to be a string giving further information for - * some WTAP_ERR_ values; "framenum" is the frame number of the record - * on which the error occurred; "file_type_subtype" is a - * WTAP_FILE_TYPE_SUBTYPE_ value for the type and subtype of file being - * written. + * "in_filename" is the name of the file from which the record being + * written came; "out_filename" is the name of the file to which we're + * writing; "err" is assumed "err" is assumed to be a UNIX-style errno + * or a WTAP_ERR_ value; "err_info" is assumed to be a string giving + * further information for some WTAP_ERR_ values; "framenum" is the frame + * number of the record on which the error occurred; "file_type_subtype" + * is a WTAP_FILE_TYPE_SUBTYPE_ value for the type and subtype of file + * being written. */ -extern void cfile_write_failure_alert_box(const char *filename, int err, - gchar *err_info, guint32 framenum, +extern void cfile_write_failure_alert_box(const char *in_filename, + const char *out_filename, + int err, gchar *err_info, + guint32 framenum, int file_type_subtype); /* |