diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-04-21 09:41:52 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-04-21 09:41:52 +0000 |
commit | 6cbf6ce16c45c4855ebddd3516465885e3c476d5 (patch) | |
tree | 299ce4fc08cb26cc0c0712c6b54de9c76893e7ca /wiretap/wtap.h | |
parent | 0315e063e4267b97fc7716301350af07dd0f2bea (diff) | |
download | wireshark-6cbf6ce16c45c4855ebddd3516465885e3c476d5.tar.gz wireshark-6cbf6ce16c45c4855ebddd3516465885e3c476d5.tar.bz2 wireshark-6cbf6ce16c45c4855ebddd3516465885e3c476d5.zip |
Add a new WTAP_ERR_DECOMPRESS error, and use that for errors discovered
by the gunzipping code. Have it also supply a err_info string, and
report it. Have file_error() supply an err_info string.
Put "the file" - or, for WTAP_ERR_DECOMPRESS, "the compressed file", to
suggest a decompression error - into the rawshark and tshark errors,
along the lines of what other programs print.
Fix a case in the Netscaler code where we weren't fetching the error
code on a read failure.
svn path=/trunk/; revision=36748
Diffstat (limited to 'wiretap/wtap.h')
-rw-r--r-- | wiretap/wtap.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 858dcf0520..3492db0c29 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1002,10 +1002,12 @@ int wtap_register_encap_type(char* name, char* short_name); /* LZ77 compressed data has bad offset to string */ #define WTAP_ERR_RANDOM_OPEN_STDIN -18 /* We're trying to open the standard input for random access */ -#define WTAP_ERR_COMPRESSION_NOT_SUPPORTED -19 +#define WTAP_ERR_COMPRESSION_NOT_SUPPORTED -19 /* The filetype doesn't support output compression */ #define WTAP_ERR_CANT_SEEK -20 /* An attempt to seek failed, reason unknown */ +#define WTAP_ERR_DECOMPRESS -21 + /* Error decompressing */ /* Errors from zlib; zlib error Z_xxx turns into Wiretap error WTAP_ERR_ZLIB + Z_xxx. |