generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shadowing: don't shadow the global compress

Browse Source
This commit is contained in:
Daniel Stenberg 2010-11-10 13:04:30 +01:00
parent fb6afd01a1
commit bef0ce5392
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/comp.c
View File

@ -134,7 +134,7 @@ comp_method_zlib_free(voidpf opaque, voidpf address)
* All your bandwidth are belong to us (so save some) * All your bandwidth are belong to us (so save some)
*/ */
static int static int
comp_method_zlib_init(LIBSSH2_SESSION * session, int compress, comp_method_zlib_init(LIBSSH2_SESSION * session, int compr,
void **abstract) void **abstract)
{ {
z_stream *strm; z_stream *strm;
@ -151,7 +151,7 @@ comp_method_zlib_init(LIBSSH2_SESSION * session, int compress,
strm->opaque = (voidpf) session; strm->opaque = (voidpf) session;
strm->zalloc = (alloc_func) comp_method_zlib_alloc; strm->zalloc = (alloc_func) comp_method_zlib_alloc;
strm->zfree = (free_func) comp_method_zlib_free; strm->zfree = (free_func) comp_method_zlib_free;
if (compress) { if (compr) {
/* deflate */ /* deflate */
status = deflateInit(strm, Z_DEFAULT_COMPRESSION); status = deflateInit(strm, Z_DEFAULT_COMPRESSION);
} else { } else {
@ -338,25 +338,19 @@ comp_method_zlib_decomp(LIBSSH2_SESSION * session,
* All done, no more compression for you * All done, no more compression for you
*/ */
static int static int
comp_method_zlib_dtor(LIBSSH2_SESSION *session, int compress, comp_method_zlib_dtor(LIBSSH2_SESSION *session, int compr, void **abstract)
void **abstract)
{ {
z_stream *strm = *abstract; z_stream *strm = *abstract;
if (strm) { if (strm) {
if (compress) { if (compr)
/* deflate */
deflateEnd(strm); deflateEnd(strm);
} else { else
/* inflate */
inflateEnd(strm); inflateEnd(strm);
}
LIBSSH2_FREE(session, strm); LIBSSH2_FREE(session, strm);
} }
*abstract = NULL; *abstract = NULL;
return 0; return 0;
} }