mirror of
https://github.com/ziglang/zig.git
synced 2025-12-06 06:13:07 +00:00
drop NameTooLong from sysctlbynameZ error set (#24909)
This commit is contained in:
parent
cab6d752e8
commit
01b5023868
@ -761,7 +761,7 @@ const PosixThreadImpl = struct {
|
||||
var count_len: usize = @sizeOf(c_int);
|
||||
const name = if (comptime target.os.tag.isDarwin()) "hw.logicalcpu" else "hw.ncpu";
|
||||
posix.sysctlbynameZ(name, &count, &count_len, null, 0) catch |err| switch (err) {
|
||||
error.NameTooLong, error.UnknownName => unreachable,
|
||||
error.UnknownName => unreachable,
|
||||
else => |e| return e,
|
||||
};
|
||||
return @as(usize, @intCast(count));
|
||||
|
||||
@ -5291,13 +5291,19 @@ pub fn sysctl(
|
||||
}
|
||||
}
|
||||
|
||||
pub const SysCtlByNameError = error{
|
||||
PermissionDenied,
|
||||
SystemResources,
|
||||
UnknownName,
|
||||
} || UnexpectedError;
|
||||
|
||||
pub fn sysctlbynameZ(
|
||||
name: [*:0]const u8,
|
||||
oldp: ?*anyopaque,
|
||||
oldlenp: ?*usize,
|
||||
newp: ?*anyopaque,
|
||||
newlen: usize,
|
||||
) SysCtlError!void {
|
||||
) SysCtlByNameError!void {
|
||||
if (native_os == .wasi) {
|
||||
@compileError("sysctl not supported on WASI");
|
||||
}
|
||||
|
||||
@ -1759,7 +1759,7 @@ pub fn totalSystemMemory() TotalSystemMemoryError!u64 {
|
||||
var physmem: c_ulong = undefined;
|
||||
var len: usize = @sizeOf(c_ulong);
|
||||
posix.sysctlbynameZ("hw.physmem", &physmem, &len, null, 0) catch |err| switch (err) {
|
||||
error.NameTooLong, error.UnknownName => unreachable,
|
||||
error.UnknownName => unreachable,
|
||||
else => return error.UnknownTotalSystemMemory,
|
||||
};
|
||||
return @as(usize, @intCast(physmem));
|
||||
|
||||
@ -228,7 +228,6 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
|
||||
var len: usize = @sizeOf(@TypeOf(value));
|
||||
|
||||
posix.sysctlbynameZ(key, &value, &len, null, 0) catch |err| switch (err) {
|
||||
error.NameTooLong => unreachable, // constant, known good value
|
||||
error.PermissionDenied => unreachable, // only when setting values,
|
||||
error.SystemResources => unreachable, // memory already on the stack
|
||||
error.UnknownName => unreachable, // constant, known good value
|
||||
|
||||
@ -397,7 +397,6 @@ pub fn detectNativeCpuAndFeatures() ?Target.Cpu {
|
||||
var cpu_family: std.c.CPUFAMILY = undefined;
|
||||
var len: usize = @sizeOf(std.c.CPUFAMILY);
|
||||
std.posix.sysctlbynameZ("hw.cpufamily", &cpu_family, &len, null, 0) catch |err| switch (err) {
|
||||
error.NameTooLong => unreachable, // constant, known good value
|
||||
error.PermissionDenied => unreachable, // only when setting values,
|
||||
error.SystemResources => unreachable, // memory already on the stack
|
||||
error.UnknownName => unreachable, // constant, known good value
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user