summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hoehn <rhoehn@gmail.com>2018-10-12 11:07:52 -0700
committerRuben Bridgewater <ruben@bridgewater.de>2018-10-15 15:34:45 +0200
commit45ef905585266504633dc4ba020b9caaea938839 (patch)
tree15ac4a703f9c382e622f0bf3e4473bce454759b1
parent093cf6f841a700a52f13ea1a9d4db0d0f6aab695 (diff)
downloadandroid-node-v8-45ef905585266504633dc4ba020b9caaea938839.tar.gz
android-node-v8-45ef905585266504633dc4ba020b9caaea938839.tar.bz2
android-node-v8-45ef905585266504633dc4ba020b9caaea938839.zip
src: add default initializer in tls_wrap
PR-URL: https://github.com/nodejs/node/pull/23567 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
-rw-r--r--src/tls_wrap.cc8
-rw-r--r--src/tls_wrap.h12
2 files changed, 7 insertions, 13 deletions
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 3dbeabd891..6bc152b2e2 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -58,13 +58,7 @@ TLSWrap::TLSWrap(Environment* env,
AsyncWrap::PROVIDER_TLSWRAP),
SSLWrap<TLSWrap>(env, sc, kind),
StreamBase(env),
- sc_(sc),
- write_size_(0),
- started_(false),
- established_(false),
- shutdown_(false),
- cycle_depth_(0),
- eof_(false) {
+ sc_(sc) {
MakeWeak();
// sc comes from an Unwrap. Make sure it was assigned.
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
index 0e26576482..4c47cd8119 100644
--- a/src/tls_wrap.h
+++ b/src/tls_wrap.h
@@ -149,19 +149,19 @@ class TLSWrap : public AsyncWrap,
BIO* enc_in_ = nullptr;
BIO* enc_out_ = nullptr;
std::vector<uv_buf_t> pending_cleartext_input_;
- size_t write_size_;
+ size_t write_size_ = 0;
WriteWrap* current_write_ = nullptr;
WriteWrap* current_empty_write_ = nullptr;
bool write_callback_scheduled_ = false;
- bool started_;
- bool established_;
- bool shutdown_;
+ bool started_ = false;
+ bool established_ = false;
+ bool shutdown_ = false;
std::string error_;
- int cycle_depth_;
+ int cycle_depth_ = 0;
// If true - delivered EOF to the js-land, either after `close_notify`, or
// after the `UV_EOF` on socket.
- bool eof_;
+ bool eof_ = false;
private:
static void GetWriteQueueSize(