Skip to content
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

Jump to bottom

Replace IOMainPort/IOMasterPort() and kIOMainPortDefault/kIOMasterPortDefault with NULL #1333

Merged
merged 2 commits into from Jul 30, 2022
Merged

Replace IOMainPort/IOMasterPort() and kIOMainPortDefault/kIOMasterPortDefault with NULL #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55411f1
Replace IOMainPort/IOMasterPort() and kIOMainPortDefault/kIOMasterPor…
kyz Jul 25, 2022
e0400cc
Use 0 as default mach port
kyz Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions disk/iostat_darwin.c
View file
Open in desktop
Expand Up @@ -18,17 +18,15 @@ static int fillstat(io_registry_entry_t d, DriveStats *stat);
int
gopsutil_v3_readdrivestat(DriveStats a[], int n)
{
mach_port_t port;
CFMutableDictionaryRef match;
io_iterator_t drives;
io_registry_entry_t d;
kern_return_t status;
int na, rv;

IOMainPort(bootstrap_port, &port);
match = IOServiceMatching("IOMedia");
CFDictionaryAddValue(match, CFSTR(kIOMediaWholeKey), kCFBooleanTrue);
status = IOServiceGetMatchingServices(port, match, &drives);
status = IOServiceGetMatchingServices(0, match, &drives);
if(status != KERN_SUCCESS)
return -1;

Expand Down
4 changes: 0 additions & 4 deletions disk/iostat_darwin.h
View file
Open in desktop
Expand Up @@ -30,7 +30,3 @@ struct CPUStats {
};

extern int gopsutil_v3_readdrivestat(DriveStats a[], int n);

#if (MAC_OS_X_VERSION_MIN_REQUIRED < 120000) // Before macOS 12 Monterey
#define IOMainPort IOMasterPort
#endif
3 changes: 1 addition & 2 deletions host/smc_darwin.c
View file
Open in desktop
Expand Up @@ -72,8 +72,7 @@ kern_return_t gopsutil_v3_open_smc(void) {
kern_return_t result;
io_service_t service;

service = IOServiceGetMatchingService(kIOMainPortDefault,
IOServiceMatching(IOSERVICE_SMC));
service = IOServiceGetMatchingService(0, IOServiceMatching(IOSERVICE_SMC));
if (service == 0) {
// Note: IOServiceMatching documents 0 on failure
printf("ERROR: %s NOT FOUND\n", IOSERVICE_SMC);
Expand Down
5 changes: 0 additions & 5 deletions host/smc_darwin.h
View file
Open in desktop
Expand Up @@ -29,9 +29,4 @@ kern_return_t gopsutil_v3_open_smc(void);
kern_return_t gopsutil_v3_close_smc(void);
double gopsutil_v3_get_temperature(char *);

#if (MAC_OS_X_VERSION_MIN_REQUIRED < 120000) // Before macOS 12 Monterey
#define kIOMainPortDefault kIOMasterPortDefault
#endif


#endif // __SMC_H__