Skip to content

Commit

Permalink
src: remove more extra semis from member fns
Browse files Browse the repository at this point in the history
PR-URL: #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>
  • Loading branch information
codebytere authored and jasnell committed May 20, 2021
1 parent 01940ee commit 2cc60fc
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions src/crypto/crypto_aes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/crypto/crypto_dh.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions src/crypto/crypto_dsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_ec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_hkdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_hmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/crypto_keygen.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_keys.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_pbkdf2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions src/crypto/crypto_random.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/crypto/crypto_rsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_scrypt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_sig.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/crypto/crypto_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_x509.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/node_blob.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/node_sockaddr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2cc60fc

Please sign in to comment.