diff options
author | Shelley Vohr <shelley.vohr@gmail.com> | 2021-05-20 12:35:39 +0300 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2021-05-20 21:19:32 +0300 |
commit | 2cc60fc64728d4253fba9953cc1e27dc72c83c32 (patch) | |
tree | 43ac64b6a1174f57a4c579ef42ad5a1359e9c2c3 /src | |
parent | 01940ee2857641b1ea08ab344f378253fe642b3b (diff) |
src: remove more extra semis from member fns
PR-URL: https://github.com/nodejs/node/pull/38744
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/crypto/crypto_aes.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_dh.h | 6 | ||||
-rw-r--r-- | src/crypto/crypto_dsa.h | 10 | ||||
-rw-r--r-- | src/crypto/crypto_ec.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_hash.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_hkdf.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_hmac.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_keygen.h | 2 | ||||
-rw-r--r-- | src/crypto/crypto_keys.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_pbkdf2.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_random.h | 14 | ||||
-rw-r--r-- | src/crypto/crypto_rsa.h | 8 | ||||
-rw-r--r-- | src/crypto/crypto_scrypt.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_sig.h | 4 | ||||
-rw-r--r-- | src/crypto/crypto_util.h | 6 | ||||
-rw-r--r-- | src/crypto/crypto_x509.h | 4 | ||||
-rw-r--r-- | src/node_blob.h | 4 | ||||
-rw-r--r-- | src/node_sockaddr.h | 4 |
18 files changed, 47 insertions, 47 deletions
diff --git a/src/crypto/crypto_aes.h b/src/crypto/crypto_aes.h index a5e37409548..d6eefffb4a8 100644 --- a/src/crypto/crypto_aes.h +++ b/src/crypto/crypto_aes.h @@ -52,8 +52,8 @@ struct AESCipherConfig final : public MemoryRetainer { AESCipherConfig& operator=(AESCipherConfig&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(AESCipherConfig); - SET_SELF_SIZE(AESCipherConfig); + SET_MEMORY_INFO_NAME(AESCipherConfig) + SET_SELF_SIZE(AESCipherConfig) }; struct AESCipherTraits final { diff --git a/src/crypto/crypto_dh.h b/src/crypto/crypto_dh.h index 7c69afb0a46..fecbf41070b 100644 --- a/src/crypto/crypto_dh.h +++ b/src/crypto/crypto_dh.h @@ -114,9 +114,9 @@ using DHKeyExportJob = KeyExportJob<DHKeyExportTraits>; struct DHBitsConfig final : public MemoryRetainer { std::shared_ptr<KeyObjectData> private_key; std::shared_ptr<KeyObjectData> public_key; - SET_NO_MEMORY_INFO(); - SET_MEMORY_INFO_NAME(DHBitsConfig); - SET_SELF_SIZE(DHBitsConfig); + SET_NO_MEMORY_INFO() + SET_MEMORY_INFO_NAME(DHBitsConfig) + SET_SELF_SIZE(DHBitsConfig) }; struct DHBitsTraits final { diff --git a/src/crypto/crypto_dsa.h b/src/crypto/crypto_dsa.h index 3f241b33ba0..647b4d9004e 100644 --- a/src/crypto/crypto_dsa.h +++ b/src/crypto/crypto_dsa.h @@ -16,8 +16,8 @@ struct DsaKeyPairParams final : public MemoryRetainer { unsigned int modulus_bits; int divisor_bits; SET_NO_MEMORY_INFO() - SET_MEMORY_INFO_NAME(DsaKeyPairParams); - SET_SELF_SIZE(DsaKeyPairParams); + SET_MEMORY_INFO_NAME(DsaKeyPairParams) + SET_SELF_SIZE(DsaKeyPairParams) }; using DsaKeyPairGenConfig = KeyPairGenConfig<DsaKeyPairParams>; @@ -38,9 +38,9 @@ struct DsaKeyGenTraits final { using DsaKeyPairGenJob = KeyGenJob<KeyPairGenTraits<DsaKeyGenTraits>>; struct DSAKeyExportConfig final : public MemoryRetainer { - SET_NO_MEMORY_INFO(); - SET_MEMORY_INFO_NAME(DSAKeyExportConfig); - SET_SELF_SIZE(DSAKeyExportConfig); + SET_NO_MEMORY_INFO() + SET_MEMORY_INFO_NAME(DSAKeyExportConfig) + SET_SELF_SIZE(DSAKeyExportConfig) }; struct DSAKeyExportTraits final { diff --git a/src/crypto/crypto_ec.h b/src/crypto/crypto_ec.h index 444fca58d49..317ee877a12 100644 --- a/src/crypto/crypto_ec.h +++ b/src/crypto/crypto_ec.h @@ -60,8 +60,8 @@ struct ECDHBitsConfig final : public MemoryRetainer { std::shared_ptr<KeyObjectData> public_; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(ECDHBitsConfig); - SET_SELF_SIZE(ECDHBitsConfig); + SET_MEMORY_INFO_NAME(ECDHBitsConfig) + SET_SELF_SIZE(ECDHBitsConfig) }; struct ECDHBitsTraits final { diff --git a/src/crypto/crypto_hash.h b/src/crypto/crypto_hash.h index b2ecce0c5b8..9f004d1dda6 100644 --- a/src/crypto/crypto_hash.h +++ b/src/crypto/crypto_hash.h @@ -52,8 +52,8 @@ struct HashConfig final : public MemoryRetainer { HashConfig& operator=(HashConfig&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(HashConfig); - SET_SELF_SIZE(HashConfig); + SET_MEMORY_INFO_NAME(HashConfig) + SET_SELF_SIZE(HashConfig) }; struct HashTraits final { diff --git a/src/crypto/crypto_hkdf.h b/src/crypto/crypto_hkdf.h index 06774bcde97..666aad65474 100644 --- a/src/crypto/crypto_hkdf.h +++ b/src/crypto/crypto_hkdf.h @@ -29,8 +29,8 @@ struct HKDFConfig final : public MemoryRetainer { HKDFConfig& operator=(HKDFConfig&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(HKDFConfig); - SET_SELF_SIZE(HKDFConfig); + SET_MEMORY_INFO_NAME(HKDFConfig) + SET_SELF_SIZE(HKDFConfig) }; struct HKDFTraits final { diff --git a/src/crypto/crypto_hmac.h b/src/crypto/crypto_hmac.h index fd7dba2ed8a..d7427ce883c 100644 --- a/src/crypto/crypto_hmac.h +++ b/src/crypto/crypto_hmac.h @@ -54,8 +54,8 @@ struct HmacConfig final : public MemoryRetainer { HmacConfig& operator=(HmacConfig&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(HmacConfig); - SET_SELF_SIZE(HmacConfig); + SET_MEMORY_INFO_NAME(HmacConfig) + SET_SELF_SIZE(HmacConfig) }; struct HmacTraits final { diff --git a/src/crypto/crypto_keygen.h b/src/crypto/crypto_keygen.h index 3dcbd2f0cec..532bcdb80c7 100644 --- a/src/crypto/crypto_keygen.h +++ b/src/crypto/crypto_keygen.h @@ -112,7 +112,7 @@ class KeyGenJob final : public CryptoJob<KeyGenTraits> { return v8::Just(errors->ToException(env).ToLocal(err)); } - SET_SELF_SIZE(KeyGenJob); + SET_SELF_SIZE(KeyGenJob) private: KeyGenJobStatus status_ = KeyGenJobStatus::FAILED; diff --git a/src/crypto/crypto_keys.h b/src/crypto/crypto_keys.h index 98e497a5b22..3662b3a3b86 100644 --- a/src/crypto/crypto_keys.h +++ b/src/crypto/crypto_keys.h @@ -149,8 +149,8 @@ class KeyObjectData : public MemoryRetainer { size_t GetSymmetricKeySize() const; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(KeyObjectData); - SET_SELF_SIZE(KeyObjectData); + SET_MEMORY_INFO_NAME(KeyObjectData) + SET_SELF_SIZE(KeyObjectData) private: explicit KeyObjectData(ByteSource symmetric_key); diff --git a/src/crypto/crypto_pbkdf2.h b/src/crypto/crypto_pbkdf2.h index 42b95627e0d..6fda7cd3101 100644 --- a/src/crypto/crypto_pbkdf2.h +++ b/src/crypto/crypto_pbkdf2.h @@ -39,8 +39,8 @@ struct PBKDF2Config final : public MemoryRetainer { PBKDF2Config& operator=(PBKDF2Config&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(PBKDF2Config); - SET_SELF_SIZE(PBKDF2Config); + SET_MEMORY_INFO_NAME(PBKDF2Config) + SET_SELF_SIZE(PBKDF2Config) }; struct PBKDF2Traits final { diff --git a/src/crypto/crypto_random.h b/src/crypto/crypto_random.h index 1a2a88dc292..c9a827f6171 100644 --- a/src/crypto/crypto_random.h +++ b/src/crypto/crypto_random.h @@ -16,9 +16,9 @@ namespace crypto { struct RandomBytesConfig final : public MemoryRetainer { unsigned char* buffer; size_t size; - SET_NO_MEMORY_INFO(); - SET_MEMORY_INFO_NAME(RandomBytesConfig); - SET_SELF_SIZE(RandomBytesConfig); + SET_NO_MEMORY_INFO() + SET_MEMORY_INFO_NAME(RandomBytesConfig) + SET_SELF_SIZE(RandomBytesConfig) }; struct RandomBytesTraits final { @@ -54,8 +54,8 @@ struct RandomPrimeConfig final : public MemoryRetainer { int bits; bool safe; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(RandomPrimeConfig); - SET_SELF_SIZE(RandomPrimeConfig); + SET_MEMORY_INFO_NAME(RandomPrimeConfig) + SET_SELF_SIZE(RandomPrimeConfig) }; struct RandomPrimeTraits final { @@ -89,8 +89,8 @@ struct CheckPrimeConfig final : public MemoryRetainer { int checks = 1; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(CheckPrimeConfig); - SET_SELF_SIZE(CheckPrimeConfig); + SET_MEMORY_INFO_NAME(CheckPrimeConfig) + SET_SELF_SIZE(CheckPrimeConfig) }; struct CheckPrimeTraits final { diff --git a/src/crypto/crypto_rsa.h b/src/crypto/crypto_rsa.h index acc233ccbb3..eea53815f04 100644 --- a/src/crypto/crypto_rsa.h +++ b/src/crypto/crypto_rsa.h @@ -31,8 +31,8 @@ struct RsaKeyPairParams final : public MemoryRetainer { int saltlen = 0; SET_NO_MEMORY_INFO() - SET_MEMORY_INFO_NAME(RsaKeyPairParams); - SET_SELF_SIZE(RsaKeyPairParams); + SET_MEMORY_INFO_NAME(RsaKeyPairParams) + SET_SELF_SIZE(RsaKeyPairParams) }; using RsaKeyPairGenConfig = KeyPairGenConfig<RsaKeyPairParams>; @@ -88,8 +88,8 @@ struct RSACipherConfig final : public MemoryRetainer { RSACipherConfig(RSACipherConfig&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(RSACipherConfig); - SET_SELF_SIZE(RSACipherConfig); + SET_MEMORY_INFO_NAME(RSACipherConfig) + SET_SELF_SIZE(RSACipherConfig) }; struct RSACipherTraits final { diff --git a/src/crypto/crypto_scrypt.h b/src/crypto/crypto_scrypt.h index b51d6c194ad..4ca888e31d4 100644 --- a/src/crypto/crypto_scrypt.h +++ b/src/crypto/crypto_scrypt.h @@ -41,8 +41,8 @@ struct ScryptConfig final : public MemoryRetainer { ScryptConfig& operator=(ScryptConfig&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(ScryptConfig); - SET_SELF_SIZE(ScryptConfig); + SET_MEMORY_INFO_NAME(ScryptConfig) + SET_SELF_SIZE(ScryptConfig) }; struct ScryptTraits final { diff --git a/src/crypto/crypto_sig.h b/src/crypto/crypto_sig.h index fa44811c3ee..5f9104fc5d3 100644 --- a/src/crypto/crypto_sig.h +++ b/src/crypto/crypto_sig.h @@ -127,8 +127,8 @@ struct SignConfiguration final : public MemoryRetainer { SignConfiguration& operator=(SignConfiguration&& other) noexcept; void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(SignConfiguration); - SET_SELF_SIZE(SignConfiguration); + SET_MEMORY_INFO_NAME(SignConfiguration) + SET_SELF_SIZE(SignConfiguration) }; struct SignTraits final { diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h index f2f61aa4518..94bcb100cca 100644 --- a/src/crypto/crypto_util.h +++ b/src/crypto/crypto_util.h @@ -188,8 +188,8 @@ struct CryptoErrorStore final : public MemoryRetainer { v8::Local<v8::String> exception_string = v8::Local<v8::String>()) const; SET_NO_MEMORY_INFO() - SET_MEMORY_INFO_NAME(CryptoErrorStore); - SET_SELF_SIZE(CryptoErrorStore); + SET_MEMORY_INFO_NAME(CryptoErrorStore) + SET_SELF_SIZE(CryptoErrorStore) private: std::vector<std::string> errors_; @@ -502,7 +502,7 @@ class DeriveBitsJob final : public CryptoJob<DeriveBitsTraits> { return v8::Just(errors->ToException(env).ToLocal(err)); } - SET_SELF_SIZE(DeriveBitsJob); + SET_SELF_SIZE(DeriveBitsJob) void MemoryInfo(MemoryTracker* tracker) const override { tracker->TrackFieldWithSize("out", out_.size()); CryptoJob<DeriveBitsTraits>::MemoryInfo(tracker); diff --git a/src/crypto/crypto_x509.h b/src/crypto/crypto_x509.h index 3bebc8e37d1..05bfb6e7cb3 100644 --- a/src/crypto/crypto_x509.h +++ b/src/crypto/crypto_x509.h @@ -98,8 +98,8 @@ class X509Certificate : public BaseObject { X509* get() { return cert_->get(); } void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(X509Certificate); - SET_SELF_SIZE(X509Certificate); + SET_MEMORY_INFO_NAME(X509Certificate) + SET_SELF_SIZE(X509Certificate) class X509CertificateTransferData : public worker::TransferData { public: diff --git a/src/node_blob.h b/src/node_blob.h index 965f65390bd..9d6178996c8 100644 --- a/src/node_blob.h +++ b/src/node_blob.h @@ -46,8 +46,8 @@ class Blob : public BaseObject { } void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(Blob); - SET_SELF_SIZE(Blob); + SET_MEMORY_INFO_NAME(Blob) + SET_SELF_SIZE(Blob) // Copies the contents of the Blob into an ArrayBuffer. v8::MaybeLocal<v8::Value> GetArrayBuffer(Environment* env); diff --git a/src/node_sockaddr.h b/src/node_sockaddr.h index 704fe0c5116..8add38b465e 100644 --- a/src/node_sockaddr.h +++ b/src/node_sockaddr.h @@ -173,8 +173,8 @@ class SocketAddressBase : public BaseObject { } void MemoryInfo(MemoryTracker* tracker) const override; - SET_MEMORY_INFO_NAME(SocketAddressBase); - SET_SELF_SIZE(SocketAddressBase); + SET_MEMORY_INFO_NAME(SocketAddressBase) + SET_SELF_SIZE(SocketAddressBase) TransferMode GetTransferMode() const override { return TransferMode::kCloneable; |