1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zlib: C++ style fixes

Browse Source
This commit is contained in:
Fedor Indutny 2012-01-11 23:46:10 +06:00
parent b073989e17
commit 07701e7cc8
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/node_zlib.cc
View File

@ -71,8 +71,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
} }
// write(flush, in, in_off, in_len, out, out_off, out_len) // write(flush, in, in_off, in_len, out, out_off, out_len)
static Handle<Value> static Handle<Value> Write(const Arguments& args) {
Write(const Arguments& args) {
HandleScope scope; HandleScope scope;
assert(args.Length() == 7); assert(args.Length() == 7);
@ -97,8 +96,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
assert(Buffer::HasInstance(args[1])); assert(Buffer::HasInstance(args[1]));
Local<Object> in_buf; Local<Object> in_buf;
in_buf = args[1]->ToObject(); in_buf = args[1]->ToObject();
in_off = (size_t)args[2]->Uint32Value(); in_off = args[2]->Uint32Value();
in_len = (size_t)args[3]->Uint32Value(); in_len = args[3]->Uint32Value();
assert(in_off + in_len <= Buffer::Length(in_buf)); assert(in_off + in_len <= Buffer::Length(in_buf));
in = reinterpret_cast<Bytef *>(Buffer::Data(in_buf) + in_off); in = reinterpret_cast<Bytef *>(Buffer::Data(in_buf) + in_off);
@ -106,8 +105,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
assert(Buffer::HasInstance(args[4])); assert(Buffer::HasInstance(args[4]));
Local<Object> out_buf = args[4]->ToObject(); Local<Object> out_buf = args[4]->ToObject();
out_off = (size_t)args[5]->Uint32Value(); out_off = args[5]->Uint32Value();
out_len = (size_t)args[6]->Uint32Value(); out_len = args[6]->Uint32Value();
assert(out_off + out_len <= Buffer::Length(out_buf)); assert(out_off + out_len <= Buffer::Length(out_buf));
out = reinterpret_cast<Bytef *>(Buffer::Data(out_buf) + out_off); out = reinterpret_cast<Bytef *>(Buffer::Data(out_buf) + out_off);
@ -115,7 +114,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
uv_work_t* work_req = &(ctx->work_req_); uv_work_t* work_req = &(ctx->work_req_);
ctx->strm_.avail_in = in_len; ctx->strm_.avail_in = in_len;
ctx->strm_.next_in = &(*in); ctx->strm_.next_in = in;
ctx->strm_.avail_out = out_len; ctx->strm_.avail_out = out_len;
ctx->strm_.next_out = out; ctx->strm_.next_out = out;
ctx->flush_ = flush; ctx->flush_ = flush;
@ -138,8 +137,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
// This function may be called multiple times on the uv_work pool // This function may be called multiple times on the uv_work pool
// for a single write() call, until all of the input bytes have // for a single write() call, until all of the input bytes have
// been consumed. // been consumed.
static void static void Process(uv_work_t* work_req) {
Process(uv_work_t* work_req) {
ZCtx<mode> *ctx = container_of(work_req, ZCtx<mode>, work_req_); ZCtx<mode> *ctx = container_of(work_req, ZCtx<mode>, work_req_);
// If the avail_out is left at 0, then it means that it ran out // If the avail_out is left at 0, then it means that it ran out
@ -150,13 +148,13 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
case DEFLATE: case DEFLATE:
case GZIP: case GZIP:
case DEFLATERAW: case DEFLATERAW:
err = deflate(&(ctx->strm_), ctx->flush_); err = deflate(&ctx->strm_, ctx->flush_);
break; break;
case UNZIP: case UNZIP:
case INFLATE: case INFLATE:
case GUNZIP: case GUNZIP:
case INFLATERAW: case INFLATERAW:
err = inflate(&(ctx->strm_), ctx->flush_); err = inflate(&ctx->strm_, ctx->flush_);
break; break;
default: default:
assert(0 && "wtf?"); assert(0 && "wtf?");
@ -169,10 +167,10 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
} }
// v8 land! // v8 land!
static void static void After(uv_work_t* work_req) {
After(uv_work_t* work_req) {
HandleScope scope; HandleScope scope;
ZCtx<mode> *ctx = container_of(work_req, ZCtx<mode>, work_req_); ZCtx<mode> *ctx = container_of(work_req, ZCtx<mode>, work_req_);
Local<Integer> avail_out = Integer::New(ctx->strm_.avail_out); Local<Integer> avail_out = Integer::New(ctx->strm_.avail_out);
Local<Integer> avail_in = Integer::New(ctx->strm_.avail_in); Local<Integer> avail_in = Integer::New(ctx->strm_.avail_in);
@ -187,8 +185,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
ctx->Unref(); ctx->Unref();
} }
static Handle<Value> static Handle<Value> New(const Arguments& args) {
New(const Arguments& args) {
HandleScope scope; HandleScope scope;
ZCtx<mode> *ctx = new ZCtx<mode>(); ZCtx<mode> *ctx = new ZCtx<mode>();
ctx->Wrap(args.This()); ctx->Wrap(args.This());
@ -196,8 +193,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
} }
// just pull the ints out of the args and call the other Init // just pull the ints out of the args and call the other Init
static Handle<Value> static Handle<Value> Init(const Arguments& args) {
Init(const Arguments& args) {
HandleScope scope; HandleScope scope;
assert(args.Length() == 4 && assert(args.Length() == 4 &&
@ -225,12 +221,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
return Undefined(); return Undefined();
} }
static void static void Init(ZCtx *ctx, int level, int windowBits, int memLevel,
Init(ZCtx *ctx, int strategy) {
int level,
int windowBits,
int memLevel,
int strategy) {
ctx->level_ = level; ctx->level_ = level;
ctx->windowBits_ = windowBits; ctx->windowBits_ = windowBits;
ctx->memLevel_ = memLevel; ctx->memLevel_ = memLevel;