From f530a36c65ed462aae5da71d8cdb189da1266e93 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 28 Jun 2016 21:21:21 +0200 Subject: [PATCH] src: fix runtime/int cpplint warnings PR-URL: https://github.com/nodejs/node/pull/7462 Reviewed-By: Trevor Norris --- src/node_crypto.cc | 39 +++++++++++++++++++++------------------ src/node_crypto_bio.cc | 5 +++-- src/node_crypto_bio.h | 3 ++- src/tls_wrap.cc | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 0bf99bd265c0bb..9f1d034645ca34 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -208,7 +208,7 @@ static int CryptoPemCallback(char *buf, int size, int rwflag, void *u) { void ThrowCryptoError(Environment* env, - unsigned long err, + unsigned long err, // NOLINT(runtime/int) const char* default_message = nullptr) { HandleScope scope(env->isolate()); if (err != 0 || default_message == nullptr) { @@ -467,7 +467,7 @@ void SecureContext::SetKey(const FunctionCallbackInfo& args) { if (!key) { BIO_free_all(bio); - unsigned long err = ERR_get_error(); + unsigned long err = ERR_get_error(); // NOLINT(runtime/int) if (!err) { return env->ThrowError("PEM_read_bio_PrivateKey"); } @@ -479,7 +479,7 @@ void SecureContext::SetKey(const FunctionCallbackInfo& args) { BIO_free_all(bio); if (!rv) { - unsigned long err = ERR_get_error(); + unsigned long err = ERR_get_error(); // NOLINT(runtime/int) if (!err) return env->ThrowError("SSL_CTX_use_PrivateKey"); return ThrowCryptoError(env, err); @@ -597,7 +597,7 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx, X509* extra = nullptr; int ret = 0; - unsigned long err = 0; + unsigned long err = 0; // NOLINT(runtime/int) // Read extra certs STACK_OF(X509)* extra_certs = sk_X509_new_null(); @@ -672,7 +672,7 @@ void SecureContext::SetCert(const FunctionCallbackInfo& args) { BIO_free_all(bio); if (!rv) { - unsigned long err = ERR_get_error(); + unsigned long err = ERR_get_error(); // NOLINT(runtime/int) if (!err) { return env->ThrowError("SSL_CTX_use_certificate_chain"); } @@ -866,7 +866,9 @@ void SecureContext::SetOptions(const FunctionCallbackInfo& args) { return sc->env()->ThrowTypeError("Bad parameter"); } - SSL_CTX_set_options(sc->ctx_, static_cast(args[0]->IntegerValue())); + SSL_CTX_set_options( + sc->ctx_, + static_cast(args[0]->IntegerValue())); // NOLINT(runtime/int) } @@ -1001,7 +1003,7 @@ void SecureContext::LoadPKCS12(const FunctionCallbackInfo& args) { delete[] pass; if (!ret) { - unsigned long err = ERR_get_error(); + unsigned long err = ERR_get_error(); // NOLINT(runtime/int) const char* str = ERR_reason_error_string(err); return env->ThrowError(str); } @@ -1427,7 +1429,7 @@ static Local X509ToObject(Environment* env, X509* cert) { String::kNormalString, mem->length)); (void) BIO_reset(bio); - unsigned long exponent_word = BN_get_word(rsa->e); + BN_ULONG exponent_word = BN_get_word(rsa->e); BIO_printf(bio, "0x%lx", exponent_word); BIO_get_mem_ptr(bio, &mem); @@ -1834,7 +1836,8 @@ void SSLWrap::VerifyError(const FunctionCallbackInfo& args) { // XXX(bnoordhuis) The UNABLE_TO_GET_ISSUER_CERT error when there is no // peer certificate is questionable but it's compatible with what was // here before. - long x509_verify_error = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT; + long x509_verify_error = // NOLINT(runtime/int) + X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT; if (X509* peer_cert = SSL_get_peer_certificate(w->ssl_)) { X509_free(peer_cert); x509_verify_error = SSL_get_verify_result(w->ssl_); @@ -2171,7 +2174,7 @@ void SSLWrap::CertCbDone(const FunctionCallbackInfo& args) { if (rv) rv = w->SetCACerts(sc); if (!rv) { - unsigned long err = ERR_get_error(); + unsigned long err = ERR_get_error(); // NOLINT(runtime/int) if (!err) return env->ThrowError("CertCbDone"); return ThrowCryptoError(env, err); @@ -2605,7 +2608,7 @@ void Connection::New(const FunctionCallbackInfo& args) { SSL_set_bio(conn->ssl_, conn->bio_read_, conn->bio_write_); #ifdef SSL_MODE_RELEASE_BUFFERS - long mode = SSL_get_mode(conn->ssl_); + long mode = SSL_get_mode(conn->ssl_); // NOLINT(runtime/int) SSL_set_mode(conn->ssl_, mode | SSL_MODE_RELEASE_BUFFERS); #endif @@ -3551,7 +3554,7 @@ void SignBase::CheckThrow(SignBase::Error error) { case kSignPrivateKey: case kSignPublicKey: { - unsigned long err = ERR_get_error(); + unsigned long err = ERR_get_error(); // NOLINT(runtime/int) if (err) return ThrowCryptoError(env(), err); switch (error) { @@ -5049,11 +5052,11 @@ class RandomBytesRequest : public AsyncWrap { size_ = 0; } - inline unsigned long error() const { + inline unsigned long error() const { // NOLINT(runtime/int) return error_; } - inline void set_error(unsigned long err) { + inline void set_error(unsigned long err) { // NOLINT(runtime/int) error_ = err; } @@ -5062,7 +5065,7 @@ class RandomBytesRequest : public AsyncWrap { uv_work_t work_req_; private: - unsigned long error_; + unsigned long error_; // NOLINT(runtime/int) size_t size_; char* data_; }; @@ -5080,9 +5083,9 @@ void RandomBytesWork(uv_work_t* work_req) { // RAND_bytes() returns 0 on error. if (r == 0) { - req->set_error(ERR_get_error()); + req->set_error(ERR_get_error()); // NOLINT(runtime/int) } else if (r == -1) { - req->set_error(static_cast(-1)); + req->set_error(static_cast(-1)); // NOLINT(runtime/int) } } @@ -5092,7 +5095,7 @@ void RandomBytesCheck(RandomBytesRequest* req, Local argv[2]) { if (req->error()) { char errmsg[256] = "Operation not supported"; - if (req->error() != static_cast(-1)) + if (req->error() != static_cast(-1)) // NOLINT(runtime/int) ERR_error_string_n(req->error(), errmsg, sizeof errmsg); argv[0] = Exception::Error(OneByteString(req->env()->isolate(), errmsg)); diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc index d155eaf79a6f9c..ec4aa69b073cec 100644 --- a/src/node_crypto_bio.cc +++ b/src/node_crypto_bio.cc @@ -164,9 +164,10 @@ int NodeBIO::Gets(BIO* bio, char* out, int size) { } -long NodeBIO::Ctrl(BIO* bio, int cmd, long num, void* ptr) { +long NodeBIO::Ctrl(BIO* bio, int cmd, long num, // NOLINT(runtime/int) + void* ptr) { NodeBIO* nbio; - long ret; + long ret; // NOLINT(runtime/int) nbio = FromBIO(bio); ret = 1; diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h index eb247b7f51ace7..4d2cf54ac1368c 100644 --- a/src/node_crypto_bio.h +++ b/src/node_crypto_bio.h @@ -89,7 +89,8 @@ class NodeBIO { static int Write(BIO* bio, const char* data, int len); static int Puts(BIO* bio, const char* str); static int Gets(BIO* bio, char* out, int size); - static long Ctrl(BIO* bio, int cmd, long num, void* ptr); + static long Ctrl(BIO* bio, int cmd, long num, // NOLINT(runtime/int) + void* ptr); // Enough to handle the most of the client hellos static const size_t kInitialBufferLength = 1024; diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 48ec8a54a98c79..bfc8107331e9c9 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -126,7 +126,7 @@ void TLSWrap::InitSSL() { SSL_set_verify(ssl_, SSL_VERIFY_NONE, crypto::VerifyCallback); #ifdef SSL_MODE_RELEASE_BUFFERS - long mode = SSL_get_mode(ssl_); + long mode = SSL_get_mode(ssl_); // NOLINT(runtime/int) SSL_set_mode(ssl_, mode | SSL_MODE_RELEASE_BUFFERS); #endif // SSL_MODE_RELEASE_BUFFERS