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

1 files changed, 5 insertions, 2 deletions

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 7dcced68fe..6b76e6eed3 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -585,7 +585,10 @@ static const char *wtap_errlist[] = {
 	"Uncompression error: data oddly truncated",
 	"Uncompression error: data would overflow buffer",
 	"Uncompression error: bad LZ77 offset",
-	"The standard input cannot be opened for random access"
+	"The standard input cannot be opened for random access",
+	"That file format doesn't support compression",
+	NULL,
+	"Uncompression error"
 };
 #define	WTAP_ERRLIST_SIZE	(sizeof wtap_errlist / sizeof wtap_errlist[0])
 
@@ -710,7 +713,7 @@ wtap_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
 		 * last packet of the file.
 		 */
 		if (*err == 0)
-			*err = file_error(wth->fh);
+			*err = file_error(wth->fh, err_info);
 		return FALSE;	/* failure */
 	}