Skip to content

Commit abba102

Browse files
gengjiawendanbev
gengjiawen
authored and
danbev
committed
src: refactor to nullptr in cpp code
Signed-off-by: gengjiawen <technicalcute@gmail.com> PR-URL: #25888 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent b8d9d4a commit abba102

6 files changed

Lines changed: 18 additions & 12 deletions

File tree

‎src/cares_wrap.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ void safe_free_hostent(struct hostent* host) {
395395
free(host->h_addr_list[idx++]);
396396
}
397397
free(host->h_addr_list);
398-
host->h_addr_list = 0;
398+
host->h_addr_list = nullptr;
399399
}
400400

401401
if (host->h_aliases != nullptr) {
@@ -404,7 +404,7 @@ void safe_free_hostent(struct hostent* host) {
404404
free(host->h_aliases[idx++]);
405405
}
406406
free(host->h_aliases);
407-
host->h_aliases = 0;
407+
host->h_aliases = nullptr;
408408
}
409409

410410
if (host->h_name != nullptr) {
@@ -1914,7 +1914,8 @@ void AfterGetNameInfo(uv_getnameinfo_t* req,
19141914
req_wrap->MakeCallback(env->oncomplete_string(), arraysize(argv), argv);
19151915
}
19161916

1917-
using ParseIPResult = decltype(static_cast<ares_addr_port_node*>(0)->addr);
1917+
using ParseIPResult =
1918+
decltype(static_cast<ares_addr_port_node*>(nullptr)->addr);
19181919

19191920
int ParseIP(const char* ip, ParseIPResult* result = nullptr) {
19201921
ParseIPResult tmp;

‎src/debug_utils.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ class PosixSymbolDebuggingContext final : public NativeSymbolDebuggingContext {
6666
return ret;
6767

6868
if (info.dli_sname != nullptr) {
69-
if (char* demangled = abi::__cxa_demangle(info.dli_sname, 0, 0, 0)) {
69+
if (char* demangled =
70+
abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, nullptr)) {
7071
ret.name = demangled;
7172
free(demangled);
7273
} else {

‎src/node.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,13 +562,15 @@ extern "C" NODE_EXTERN void node_module_register(void* mod);
562562
/* Called after the event loop exits but before the VM is disposed.
563563
* Callbacks are run in reverse order of registration, i.e. newest first.
564564
*/
565-
NODE_EXTERN void AtExit(void (*cb)(void* arg), void* arg = 0);
565+
NODE_EXTERN void AtExit(void (*cb)(void* arg), void* arg = nullptr);
566566

567567
/* Registers a callback with the passed-in Environment instance. The callback
568568
* is called after the event loop exits, but before the VM is disposed.
569569
* Callbacks are run in reverse order of registration, i.e. newest first.
570570
*/
571-
NODE_EXTERN void AtExit(Environment* env, void (*cb)(void* arg), void* arg = 0);
571+
NODE_EXTERN void AtExit(Environment* env,
572+
void (*cb)(void* arg),
573+
void* arg = nullptr);
572574

573575
typedef void (*promise_hook_func) (v8::PromiseHookType type,
574576
v8::Local<v8::Promise> promise,

‎src/node_crypto.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4817,7 +4817,7 @@ void DiffieHellman::Initialize(Environment* env, Local<Object> target) {
48174817

48184818
bool DiffieHellman::Init(int primeLength, int g) {
48194819
dh_.reset(DH_new());
4820-
if (!DH_generate_parameters_ex(dh_.get(), primeLength, g, 0))
4820+
if (!DH_generate_parameters_ex(dh_.get(), primeLength, g, nullptr))
48214821
return false;
48224822
return VerifyContext();
48234823
}
@@ -4840,8 +4840,10 @@ bool DiffieHellman::Init(const char* p, int p_len, int g) {
48404840

48414841
bool DiffieHellman::Init(const char* p, int p_len, const char* g, int g_len) {
48424842
dh_.reset(DH_new());
4843-
BIGNUM* bn_p = BN_bin2bn(reinterpret_cast<const unsigned char*>(p), p_len, 0);
4844-
BIGNUM* bn_g = BN_bin2bn(reinterpret_cast<const unsigned char*>(g), g_len, 0);
4843+
BIGNUM* bn_p =
4844+
BN_bin2bn(reinterpret_cast<const unsigned char*>(p), p_len, nullptr);
4845+
BIGNUM* bn_g =
4846+
BN_bin2bn(reinterpret_cast<const unsigned char*>(g), g_len, nullptr);
48454847
if (!DH_set0_pqg(dh_.get(), bn_p, nullptr, bn_g)) {
48464848
BN_free(bn_p);
48474849
BN_free(bn_g);
@@ -5009,7 +5011,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
50095011
BignumPointer key(BN_bin2bn(
50105012
reinterpret_cast<unsigned char*>(Buffer::Data(args[0])),
50115013
Buffer::Length(args[0]),
5012-
0));
5014+
nullptr));
50135015

50145016
MallocedBuffer<char> data(DH_size(diffieHellman->dh_.get()));
50155017

‎src/util-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ typename ListHead<T, M>::Iterator ListHead<T, M>::end() const {
143143

144144
template <typename Inner, typename Outer>
145145
constexpr uintptr_t OffsetOf(Inner Outer::*field) {
146-
return reinterpret_cast<uintptr_t>(&(static_cast<Outer*>(0)->*field));
146+
return reinterpret_cast<uintptr_t>(&(static_cast<Outer*>(nullptr)->*field));
147147
}
148148

149149
template <typename Inner, typename Outer>

‎src/util.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static void MakeUtf8String(Isolate* isolate,
4848
const int flags =
4949
String::NO_NULL_TERMINATION | String::REPLACE_INVALID_UTF8;
5050
const int length =
51-
string->WriteUtf8(isolate, target->out(), storage, 0, flags);
51+
string->WriteUtf8(isolate, target->out(), storage, nullptr, flags);
5252
target->SetLengthAndZeroTerminate(length);
5353
}
5454

0 commit comments

Comments
 (0)