Skip to content

8303047: avoid NULL after 8301661 #1524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MBaesken wants to merge 1 commit into from
Closed

8303047: avoid NULL after 8301661 #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hotspot/os/bsd/os_bsd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,15 +1379,15 @@ void os::print_os_info(outputStream* st) {

#ifdef __APPLE__
static void print_sysctl_info_string(const char* sysctlkey, outputStream* st, char* buf, size_t size) {
if (sysctlbyname(sysctlkey, buf, &size, NULL, 0) >= 0) {
if (sysctlbyname(sysctlkey, buf, &size, nullptr, 0) >= 0) {
st->print_cr("%s:%s", sysctlkey, buf);
}
}

static void print_sysctl_info_uint64(const char* sysctlkey, outputStream* st) {
uint64_t val;
size_t size=sizeof(uint64_t);
if (sysctlbyname(sysctlkey, &val, &size, NULL, 0) >= 0) {
if (sysctlbyname(sysctlkey, &val, &size, nullptr, 0) >= 0) {
st->print_cr("%s:%llu", sysctlkey, val);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/os/windows/os_windows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,7 +1946,7 @@ void os::pd_print_cpu_info(outputStream* st, char* buf, size_t buflen) {
}

size_t sz_check = sizeof(PROCESSOR_POWER_INFORMATION) * (size_t)proc_count;
NTSTATUS status = ::CallNtPowerInformation(ProcessorInformation, NULL, 0, buf, (ULONG) buflen);
NTSTATUS status = ::CallNtPowerInformation(ProcessorInformation, nullptr, 0, buf, (ULONG) buflen);
int max_mhz = -1, current_mhz = -1, mhz_limit = -1;
bool same_vals_for_all_cpus = true;

Expand Down