diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-04-12 16:31:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-04-12 16:31:16 +0000 |
| commit | fd96236cdfbd3d59b5fd895c5f517bbd9de31b8a (patch) | |
| tree | 069c2771487d975f63cd3eb038cfe2436efa399b /wiretap/file_wrappers.c | |
| parent | 91e1769ac5f0d0ee80deff9bfacee3ba3c1ace50 (diff) | |
From Jakub Zawadski: some small fixes.
From me: small indentation fix (use spaces rather than tabs in all lines
in that routine).
svn path=/trunk/; revision=36591
Diffstat (limited to 'wiretap/file_wrappers.c')
| -rw-r--r-- | wiretap/file_wrappers.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index 8ca892b196..4decfbd552 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -1040,9 +1040,9 @@ gzwfile_open(const char *path) return NULL; state = gzwfile_fdopen(fd); if (state == NULL) { - save_errno = errno; - close(fd); save_errno = errno; + close(fd); + errno = save_errno; } return state; } @@ -1085,10 +1085,8 @@ gz_init(GZWFILE_T state) state->in = g_try_malloc(state->want); state->out = g_try_malloc(state->want); if (state->in == NULL || state->out == NULL) { - if (state->out != NULL) - g_free(state->out); - if (state->in != NULL) - g_free(state->in); + g_free(state->out); + g_free(state->in); state->err = WTAP_ERR_ZLIB + Z_MEM_ERROR; /* ENOMEM? */ return -1; } @@ -1100,6 +1098,7 @@ gz_init(GZWFILE_T state) ret = deflateInit2(strm, state->level, Z_DEFLATED, 15 + 16, 8, state->strategy); if (ret != Z_OK) { + g_free(state->out); g_free(state->in); state->err = WTAP_ERR_ZLIB + Z_MEM_ERROR; /* ENOMEM? */ return -1; |