fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 00:03:58 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: replaces NULL to nullptr

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/memory/memory_linux.c
+22 -22
View File
@@ -17,36 +17,36 @@ const char* ffDetectMemory(FFMemoryResult* ram) {
cached = 0,
sReclaimable = 0;
char* token = NULL;
if ((token = memmem(buf, (size_t) nRead, "MemTotal:", strlen("MemTotal:"))) != NULL) {
memTotal = (uint64_t) strtoull(token + strlen("MemTotal:"), NULL, 10);
char* token = nullptr;
if ((token = memmem(buf, (size_t) nRead, "MemTotal:", strlen("MemTotal:"))) != nullptr) {
memTotal = (uint64_t) strtoull(token + strlen("MemTotal:"), nullptr, 10);
} else {
return "MemTotal not found in /proc/meminfo";
}
if ((token = memmem(buf, (size_t) nRead, "MemAvailable:", strlen("MemAvailable:"))) != NULL) {
memAvailable = (uint64_t) strtoull(token + strlen("MemAvailable:"), NULL, 10);
if ((token = memmem(buf, (size_t) nRead, "MemAvailable:", strlen("MemAvailable:"))) != nullptr) {
memAvailable = (uint64_t) strtoull(token + strlen("MemAvailable:"), nullptr, 10);
}
if (memAvailable == 0 || memAvailable >= memTotal) { // MemAvailable can be unreasonable. #1988
if ((token = memmem(buf, (size_t) nRead, "MemFree:", strlen("MemFree:"))) != NULL) {
memFree = (uint64_t) strtoull(token + strlen("MemFree:"), NULL, 10);
if ((token = memmem(buf, (size_t) nRead, "MemFree:", strlen("MemFree:"))) != nullptr) {
memFree = (uint64_t) strtoull(token + strlen("MemFree:"), nullptr, 10);
}
if ((token = memmem(buf, (size_t) nRead, "Buffers:", strlen("Buffers:"))) != NULL) {
buffers = (uint64_t) strtoull(token + strlen("Buffers:"), NULL, 10);
if ((token = memmem(buf, (size_t) nRead, "Buffers:", strlen("Buffers:"))) != nullptr) {
buffers = (uint64_t) strtoull(token + strlen("Buffers:"), nullptr, 10);
}
if ((token = memmem(buf, (size_t) nRead, "Cached:", strlen("Cached:"))) != NULL) {
cached = (uint64_t) strtoull(token + strlen("Cached:"), NULL, 10);
if ((token = memmem(buf, (size_t) nRead, "Cached:", strlen("Cached:"))) != nullptr) {
cached = (uint64_t) strtoull(token + strlen("Cached:"), nullptr, 10);
}
if ((token = memmem(buf, (size_t) nRead, "Shmem:", strlen("Shmem:"))) != NULL) {
shmem = (uint64_t) strtoull(token + strlen("Shmem:"), NULL, 10);
if ((token = memmem(buf, (size_t) nRead, "Shmem:", strlen("Shmem:"))) != nullptr) {
shmem = (uint64_t) strtoull(token + strlen("Shmem:"), nullptr, 10);
}
if ((token = memmem(buf, (size_t) nRead, "SReclaimable:", strlen("SReclaimable:"))) != NULL) {
sReclaimable = (uint64_t) strtoull(token + strlen("SReclaimable:"), NULL, 10);
if ((token = memmem(buf, (size_t) nRead, "SReclaimable:", strlen("SReclaimable:"))) != nullptr) {
sReclaimable = (uint64_t) strtoull(token + strlen("SReclaimable:"), nullptr, 10);
}
memAvailable = memFree + buffers + cached + sReclaimable - shmem;
@@ -65,25 +65,25 @@ const char* ffDetectMemory(FFMemoryResult* ram) {
// Skip first line
const char* p = memchr(buf, '\n', (size_t) nRead);
if (__builtin_expect(p != NULL, true)) {
if (__builtin_expect(p != nullptr, true)) {
++p;
nRead -= (p - buf);
assert(nRead > 0);
// Find line offset of data
const char* pData = memmem(p, (size_t) nRead, "data\n", strlen("data\n"));
if (__builtin_expect(pData != NULL, true)) {
if (__builtin_expect(pData != nullptr, true)) {
uint32_t dataOffset = (uint32_t) (pData - p);
p += dataOffset + strlen("data\n");
nRead -= (ssize_t) (dataOffset + strlen("data\n"));
assert(nRead > 0);
if ((token = memmem(p, (size_t) nRead, "\nsize ", strlen("\nsize "))) != NULL) {
arcSize = (uint64_t) strtoull(token + 1 + dataOffset, NULL, 10);
if ((token = memmem(p, (size_t) nRead, "\nsize ", strlen("\nsize "))) != nullptr) {
arcSize = (uint64_t) strtoull(token + 1 + dataOffset, nullptr, 10);
if (arcSize > 0) {
uint64_t arcMin = 0;
if ((token = memmem(p, (size_t) nRead, "\nc_min ", strlen("\nc_min "))) != NULL) {
arcMin = (uint64_t) strtoull(token + 1 + dataOffset, NULL, 10);
if ((token = memmem(p, (size_t) nRead, "\nc_min ", strlen("\nc_min "))) != nullptr) {
arcMin = (uint64_t) strtoull(token + 1 + dataOffset, nullptr, 10);
if (arcSize > arcMin) {
arcSize -= arcMin;
if (ram->bytesUsed > arcSize) {
@@ -97,5 +97,5 @@ const char* ffDetectMemory(FFMemoryResult* ram) {
}
}
return NULL;
return nullptr;
}