diff options
| author |  Jan Beich | 2020-06-30 22:55:47 +0000 |
|---|---|---|
| committer | Jan Beich | 2020-06-30 23:00:18 +0000 |
| commit | 3b1683a152610b2da161ba3084e2dd5942127303 (patch) | |
| tree | 5e0cf66851b8531f6e0ea6dc6c94d7726fcc5226 /src/common/memory_detect.cpp | |
| parent | common: add sysconf() fallback (diff) | |
| download | yuzu-3b1683a152610b2da161ba3084e2dd5942127303.tar.gz yuzu-3b1683a152610b2da161ba3084e2dd5942127303.tar.xz yuzu-3b1683a152610b2da161ba3084e2dd5942127303.zip | |
common: switch to nullptr for sysctl's empty new value
Diffstat (limited to '')
| -rw-r--r-- | src/common/memory_detect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/memory_detect.cpp b/src/common/memory_detect.cpp index e981b9a2a..8cff6ec37 100644 --- a/src/common/memory_detect.cpp +++ b/src/common/memory_detect.cpp | |||
| @@ -40,16 +40,16 @@ static MemoryInfo Detect() { | |||
| 40 | // hw and vm are defined in sysctl.h | 40 | // hw and vm are defined in sysctl.h |
| 41 | // https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471 | 41 | // https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471 |
| 42 | // sysctlbyname(const char *, void *, size_t *, void *, size_t); | 42 | // sysctlbyname(const char *, void *, size_t *, void *, size_t); |
| 43 | sysctlbyname("hw.memsize", &ramsize, &sizeof_ramsize, NULL, 0); | 43 | sysctlbyname("hw.memsize", &ramsize, &sizeof_ramsize, nullptr, 0); |
| 44 | sysctlbyname("vm.swapusage", &vmusage, &sizeof_vmusage, NULL, 0); | 44 | sysctlbyname("vm.swapusage", &vmusage, &sizeof_vmusage, nullptr, 0); |
| 45 | mem_info.TotalPhysicalMemory = ramsize; | 45 | mem_info.TotalPhysicalMemory = ramsize; |
| 46 | mem_info.TotalSwapMemory = vmusage.xsu_total; | 46 | mem_info.TotalSwapMemory = vmusage.xsu_total; |
| 47 | #elif defined(__FreeBSD__) | 47 | #elif defined(__FreeBSD__) |
| 48 | u_long physmem, swap_total; | 48 | u_long physmem, swap_total; |
| 49 | std::size_t sizeof_u_long = sizeof(u_long); | 49 | std::size_t sizeof_u_long = sizeof(u_long); |
| 50 | // sysctlbyname(const char *, void *, size_t *, const void *, size_t); | 50 | // sysctlbyname(const char *, void *, size_t *, const void *, size_t); |
| 51 | sysctlbyname("hw.physmem", &physmem, &sizeof_u_long, NULL, 0); | 51 | sysctlbyname("hw.physmem", &physmem, &sizeof_u_long, nullptr, 0); |
| 52 | sysctlbyname("vm.swap_total", &swap_total, &sizeof_u_long, NULL, 0); | 52 | sysctlbyname("vm.swap_total", &swap_total, &sizeof_u_long, nullptr, 0); |
| 53 | mem_info.TotalPhysicalMemory = physmem; | 53 | mem_info.TotalPhysicalMemory = physmem; |
| 54 | mem_info.TotalSwapMemory = swap_total; | 54 | mem_info.TotalSwapMemory = swap_total; |
| 55 | #elif defined(__linux__) | 55 | #elif defined(__linux__) |