From 48b16aad47d321885ae02ada6afe4ef2532c09b7 Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Sat, 7 Jul 2018 17:24:27 -0400
Subject: [PATCH] zlib: instance-ify two methods

Both `Params` and `SetDictionary` take `ZCtx` as an arg, so just make
them both instance methods on `ZCtx`.

PR-URL: https://github.com/nodejs/node/pull/21702
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_zlib.cc | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 893209d4d42012..169816d16f48b6 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -486,7 +486,7 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
                     write_js_callback, dictionary, dictionary_len);
     if (!ret) goto end;
 
-    SetDictionary(ctx);
+    ctx->SetDictionary();
 
    end:
     return args.GetReturnValue().Set(ret);
@@ -496,14 +496,14 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
     CHECK(args.Length() == 2 && "params(level, strategy)");
     ZCtx* ctx;
     ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Holder());
-    Params(ctx, args[0]->Int32Value(), args[1]->Int32Value());
+    ctx->Params(args[0]->Int32Value(), args[1]->Int32Value());
   }
 
   static void Reset(const FunctionCallbackInfo<Value> &args) {
     ZCtx* ctx;
     ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Holder());
     ctx->Reset();
-    SetDictionary(ctx);
+    ctx->SetDictionary();
   }
 
   static bool Init(ZCtx* ctx, int level, int windowBits, int memLevel,
@@ -577,51 +577,47 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
     return true;
   }
 
-  static void SetDictionary(ZCtx* ctx) {
-    if (ctx->dictionary_ == nullptr)
+  void SetDictionary() {
+    if (dictionary_ == nullptr)
       return;
 
-    ctx->err_ = Z_OK;
+    err_ = Z_OK;
 
-    switch (ctx->mode_) {
+    switch (mode_) {
       case DEFLATE:
       case DEFLATERAW:
-        ctx->err_ = deflateSetDictionary(&ctx->strm_,
-                                         ctx->dictionary_,
-                                         ctx->dictionary_len_);
+        err_ = deflateSetDictionary(&strm_, dictionary_, dictionary_len_);
         break;
       case INFLATERAW:
         // The other inflate cases will have the dictionary set when inflate()
         // returns Z_NEED_DICT in Process()
-        ctx->err_ = inflateSetDictionary(&ctx->strm_,
-                                         ctx->dictionary_,
-                                         ctx->dictionary_len_);
+        err_ = inflateSetDictionary(&strm_, dictionary_, dictionary_len_);
         break;
       default:
         break;
     }
 
-    if (ctx->err_ != Z_OK) {
-      ctx->Error("Failed to set dictionary");
+    if (err_ != Z_OK) {
+      Error("Failed to set dictionary");
     }
   }
 
-  static void Params(ZCtx* ctx, int level, int strategy) {
-    AllocScope alloc_scope(ctx);
+  void Params(int level, int strategy) {
+    AllocScope alloc_scope(this);
 
-    ctx->err_ = Z_OK;
+    err_ = Z_OK;
 
-    switch (ctx->mode_) {
+    switch (mode_) {
       case DEFLATE:
       case DEFLATERAW:
-        ctx->err_ = deflateParams(&ctx->strm_, level, strategy);
+        err_ = deflateParams(&strm_, level, strategy);
         break;
       default:
         break;
     }
 
-    if (ctx->err_ != Z_OK && ctx->err_ != Z_BUF_ERROR) {
-      ctx->Error("Failed to set parameters");
+    if (err_ != Z_OK && err_ != Z_BUF_ERROR) {
+      Error("Failed to set parameters");
     }
   }