diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-10-05 07:22:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-10-05 07:22:53 +0000 |
| commit | 66c411777b0cf5fe645ae0cd1a1b0071cba5be4c (patch) | |
| tree | b4a524a0f8639f6b3cc51cccd7a5cd0c4fa8432f /wiretap/wtap.c | |
| parent | 5f7868c7e039265d585f79952d1cd1867ab5cf1e (diff) | |
Make "wtap_strerror()" handle zlib errors *correctly*.
svn path=/trunk/; revision=770
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index e4a85ec7ff..959878ed35 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.23 1999/10/05 07:06:07 guy Exp $ + * $Id: wtap.c,v 1.24 1999/10/05 07:22:53 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -121,17 +121,17 @@ const char *wtap_strerror(int err) int wtap_errlist_index; if (err < 0) { +#ifdef HAVE_LIBZ + if (err >= WTAP_ERR_ZLIB_MIN && err <= WTAP_ERR_ZLIB_MAX) { + /* Assume it's a zlib error. */ + sprintf(errbuf, "Uncompression error: %s", + zError(err - WTAP_ERR_ZLIB)); + return errbuf; + } +#endif wtap_errlist_index = -1 - err; if (wtap_errlist_index >= WTAP_ERRLIST_SIZE) { -#ifdef HAVE_ZLIB - if (err >= WTAP_ERR_ZLIB_MIN - && err <= WTAP_ERR_ZLIB_MAX) { - /* Assume it's a zlib error. */ - sprintf(errbuf, "Zlib error: %s", - zError(err)); - } else -#endif - sprintf(errbuf, "Error %d", err); + sprintf(errbuf, "Error %d", err); return errbuf; } if (wtap_errlist[wtap_errlist_index] == NULL) |