daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zlib: C++ style fixes for dictionary

v0.7.4-release
Fedor Indutny 2012-01-12 03:11:31 +06:00
parent 9e6957b0a5
commit 89556f5a2f
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/node_zlib.cc
View File

@ -166,15 +166,13 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
assert(ctx->dictionary_ != NULL && "Stream has no dictionary"); assert(ctx->dictionary_ != NULL && "Stream has no dictionary");
// Load it // Load it
err = inflateSetDictionary( err = inflateSetDictionary(&ctx->strm_,
&(ctx->strm_),
ctx->dictionary_, ctx->dictionary_,
ctx->dictionary_len_ ctx->dictionary_len_);
);
assert(err == Z_OK && "Failed to set dictionary"); assert(err == Z_OK && "Failed to set dictionary");
// And try to decode again // And try to decode again
err = inflate(&(ctx->strm_), ctx->flush_); err = inflate(&ctx->strm_, ctx->flush_);
} }
break; break;
default: default:
@ -284,7 +282,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
case DEFLATE: case DEFLATE:
case GZIP: case GZIP:
case DEFLATERAW: case DEFLATERAW:
err = deflateInit2(&(ctx->strm_), err = deflateInit2(&ctx->strm_,
ctx->level_, ctx->level_,
Z_DEFLATED, Z_DEFLATED,
ctx->windowBits_, ctx->windowBits_,
@ -295,7 +293,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
case GUNZIP: case GUNZIP:
case INFLATERAW: case INFLATERAW:
case UNZIP: case UNZIP:
err = inflateInit2(&(ctx->strm_), ctx->windowBits_); err = inflateInit2(&ctx->strm_, ctx->windowBits_);
break; break;
default: default:
assert(0 && "wtf?"); assert(0 && "wtf?");
@ -310,11 +308,9 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
switch (mode) { switch (mode) {
case DEFLATE: case DEFLATE:
case DEFLATERAW: case DEFLATERAW:
err = deflateSetDictionary( err = deflateSetDictionary(&ctx->strm_,
&(ctx->strm_),
ctx->dictionary_, ctx->dictionary_,
dictionary_len dictionary_len);
);
break; break;
default: default:
break; break;