diff --git a/base/base/getAvailableMemoryAmount.cpp b/base/base/getAvailableMemoryAmount.cpp index a7b12ef4699..d2f794e8952 100644 --- a/base/base/getAvailableMemoryAmount.cpp +++ b/base/base/getAvailableMemoryAmount.cpp @@ -27,7 +27,7 @@ uint64_t getAvailableMemoryAmountOrZero() unsigned int usermem; size_t len = sizeof(usermem); static int mib[2] = { CTL_HW, HW_USERMEM }; - if (sysctl(mib, 2, &usermem, &len, NULL, 0) == 0 && len == sizeof(usermem)) + if (sysctl(mib, 2, &usermem, &len, nullptr, 0) == 0 && len == sizeof(usermem)) return usermem; else return 0; diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h index a0c761a516f..27041a2f0a8 100644 --- a/src/Common/filesystemHelpers.h +++ b/src/Common/filesystemHelpers.h @@ -35,13 +35,13 @@ enum class BlockDeviceType #if !defined(__linux__) [[noreturn]] #endif -BlockDeviceType getBlockDeviceType([[maybe_unused]] const String & deviceId); +BlockDeviceType getBlockDeviceType([[maybe_unused]] const String & device_id); // Get size of read-ahead in bytes for specified block device #if !defined(__linux__) [[noreturn]] #endif -UInt64 getBlockDeviceReadAheadBytes([[maybe_unused]] const String & deviceId); +UInt64 getBlockDeviceReadAheadBytes([[maybe_unused]] const String & device_id); /// Returns mount point of filesystem where absolute_path (must exist) is located std::filesystem::path getMountPoint(std::filesystem::path absolute_path);