diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-11-19 20:18:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-11-19 20:18:01 +0000 |
| commit | 2929c93ea276766076aed8bf617befba65d32eb4 (patch) | |
| tree | 23f6e64eaa570e79fd24e3dd413e77eed56f9737 /epan/filesystem.c | |
| parent | 4b2aa811e14412e3731714e4e54c344e967173c1 (diff) | |
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
Diffstat (limited to 'epan/filesystem.c')
| -rw-r--r-- | epan/filesystem.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index d3a5beeda5..2e744455ca 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -1688,10 +1688,6 @@ file_write_error_message(int err) break; #endif - case WTAP_ERR_SHORT_WRITE: - errmsg = "A full write couldn't be done to the file \"%s\"."; - break; - default: g_snprintf(errmsg_errno, sizeof(errmsg_errno), "An error occurred while writing to the file \"%%s\": %s.", |