Global: replaces NULL to nullptr

This commit is contained in:
李通洲
2026-07-10 18:08:04 +08:00
parent 873454191f
commit ba18705d2e
387 changed files with 2411 additions and 2411 deletions
+3 -3
View File
@@ -20,14 +20,14 @@ void ffPrepareNetIO(FFNetIOOptions* options) {
}
const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options) {
const char* error = NULL;
const char* error = nullptr;
if (options->detectTotal) {
error = ffNetIOGetIoCounters(result, options);
if (error) {
return error;
}
return NULL;
return nullptr;
}
if (time1 == 0) {
@@ -77,5 +77,5 @@ const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options) {
}
time1 = time2;
return NULL;
return nullptr;
}
+3 -3
View File
@@ -11,8 +11,8 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
int mib[] = { CTL_NET, PF_LINK, NETLINK_GENERIC, options->defaultRouteOnly ? IFMIB_IFDATA : IFMIB_IFALLDATA, options->defaultRouteOnly ? (int) ffNetifGetDefaultRouteV4()->ifIndex : 0, IFDATA_GENERAL };
size_t bufSize = 0;
if (sysctl(mib, ARRAY_SIZE(mib), NULL, &bufSize, 0, 0) < 0) {
return "sysctl(mib, ARRAY_SIZE(mib), NULL, &bufSize, 0, 0) failed";
if (sysctl(mib, ARRAY_SIZE(mib), nullptr, &bufSize, 0, 0) < 0) {
return "sysctl(mib, ARRAY_SIZE(mib), nullptr, &bufSize, 0, 0) failed";
}
assert(bufSize % sizeof(struct ifmibdata) == 0);
@@ -51,5 +51,5 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
};
}
return NULL;
return nullptr;
}
+3 -3
View File
@@ -14,8 +14,8 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
uint32_t defaultRouteIfIndex = ffNetifGetDefaultRouteV4()->ifIndex;
size_t bufSize = 0;
if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, (options->defaultRouteOnly ? (int) defaultRouteIfIndex : 0) }, 6, NULL, &bufSize, 0, 0) < 0) {
return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, ifIndex }, 6, NULL, &bufSize, 0, 0) failed";
if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, (options->defaultRouteOnly ? (int) defaultRouteIfIndex : 0) }, 6, nullptr, &bufSize, 0, 0) < 0) {
return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, ifIndex }, 6, nullptr, &bufSize, 0, 0) failed";
}
FF_AUTO_FREE struct if_msghdr* buf = (struct if_msghdr*) malloc(bufSize);
@@ -58,5 +58,5 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
};
}
return NULL;
return nullptr;
}
+1 -1
View File
@@ -48,5 +48,5 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
};
}
return NULL;
return nullptr;
}
+4 -4
View File
@@ -58,7 +58,7 @@ static void getData(FFstrbuf* buffer, const char* ifName, bool isDefaultRoute, i
const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/net");
if (!dirp) {
return "opendir(\"/sys/class/net\") == NULL";
return "opendir(\"/sys/class/net\") == nullptr";
}
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
@@ -67,13 +67,13 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
if (options->defaultRouteOnly) {
if (options->namePrefix.length && strncmp(defaultRouteIfName, options->namePrefix.chars, options->namePrefix.length) != 0) {
return NULL;
return nullptr;
}
getData(&buffer, defaultRouteIfName, true, dirfd(dirp), result);
} else {
struct dirent* entry;
while ((entry = readdir(dirp)) != NULL) {
while ((entry = readdir(dirp)) != nullptr) {
const char* ifName = entry->d_name;
if (ifName[0] == '.') {
continue;
@@ -87,5 +87,5 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
}
}
return NULL;
return nullptr;
}
+2 -2
View File
@@ -33,7 +33,7 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
continue;
}
if (kstat_read(kc, ks, NULL) < 0) {
if (kstat_read(kc, ks, nullptr) < 0) {
continue;
}
@@ -64,5 +64,5 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
}
}
return NULL;
return nullptr;
}
+3 -3
View File
@@ -8,7 +8,7 @@
#include <iphlpapi.h>
const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
IP_ADAPTER_ADDRESSES* FF_AUTO_FREE adapter_addresses = NULL;
IP_ADAPTER_ADDRESSES* FF_AUTO_FREE adapter_addresses = nullptr;
// Multiple attempts in case interfaces change while
// we are in the middle of querying them.
@@ -22,7 +22,7 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
DWORD error = GetAdaptersAddresses(
AF_UNSPEC,
GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER,
NULL,
nullptr,
adapter_addresses,
&adapter_addresses_buffer_size);
@@ -67,5 +67,5 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) {
}
}
return NULL;
return nullptr;
}