authorgravatar for 3041675+imomaliev@users.noreply.github.comSardorbek Imomaliev <3041675+imomaliev@users.noreply.github.com> 2025-08-21 11:36:57+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-08-21 12:36:57+02:00
log01b5023868a2881d69e2947c0fd7d9bcf51a1698
tree2a2aef147fa22c9ce106cc3549acfd7030b802ee
parentcab6d752e8f6f6d3f538075840acc108238feda3
signaturebadge-check Signed by PGP key B5690EEEBB952194

drop NameTooLong from sysctlbynameZ error set (#24909)

5 files changed, 9 insertions(+), 5 deletions(-)

lib/std/Thread.zig+1-1
......@@ -761,7 +761,7 @@ const PosixThreadImpl = struct {
761761 var count_len: usize = @sizeOf(c_int);
762762 const name = if (comptime target.os.tag.isDarwin()) "hw.logicalcpu" else "hw.ncpu";
763763 posix.sysctlbynameZ(name, &count, &count_len, null, 0) catch |err| switch (err) {
764 error.NameTooLong, error.UnknownName => unreachable,
764 error.UnknownName => unreachable,
765765 else => |e| return e,
766766 };
767767 return @as(usize, @intCast(count));
lib/std/posix.zig+7-1
......@@ -5291,13 +5291,19 @@ pub fn sysctl(
52915291 }
52925292}
52935293
5294pub const SysCtlByNameError = error{
5295 PermissionDenied,
5296 SystemResources,
5297 UnknownName,
5298} || UnexpectedError;
5299
52945300pub fn sysctlbynameZ(
52955301 name: [*:0]const u8,
52965302 oldp: ?*anyopaque,
52975303 oldlenp: ?*usize,
52985304 newp: ?*anyopaque,
52995305 newlen: usize,
5300) SysCtlError!void {
5306) SysCtlByNameError!void {
53015307 if (native_os == .wasi) {
53025308 @compileError("sysctl not supported on WASI");
53035309 }
lib/std/process.zig+1-1
......@@ -1759,7 +1759,7 @@ pub fn totalSystemMemory() TotalSystemMemoryError!u64 {
17591759 var physmem: c_ulong = undefined;
17601760 var len: usize = @sizeOf(c_ulong);
17611761 posix.sysctlbynameZ("hw.physmem", &physmem, &len, null, 0) catch |err| switch (err) {
1762 error.NameTooLong, error.UnknownName => unreachable,
1762 error.UnknownName => unreachable,
17631763 else => return error.UnknownTotalSystemMemory,
17641764 };
17651765 return @as(usize, @intCast(physmem));
lib/std/zig/system.zig-1
......@@ -228,7 +228,6 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
228228 var len: usize = @sizeOf(@TypeOf(value));
229229
230230 posix.sysctlbynameZ(key, &value, &len, null, 0) catch |err| switch (err) {
231 error.NameTooLong => unreachable, // constant, known good value
232231 error.PermissionDenied => unreachable, // only when setting values,
233232 error.SystemResources => unreachable, // memory already on the stack
234233 error.UnknownName => unreachable, // constant, known good value
lib/std/zig/system/darwin/macos.zig-1
......@@ -397,7 +397,6 @@ pub fn detectNativeCpuAndFeatures() ?Target.Cpu {
397397 var cpu_family: std.c.CPUFAMILY = undefined;
398398 var len: usize = @sizeOf(std.c.CPUFAMILY);
399399 std.posix.sysctlbynameZ("hw.cpufamily", &cpu_family, &len, null, 0) catch |err| switch (err) {
400 error.NameTooLong => unreachable, // constant, known good value
401400 error.PermissionDenied => unreachable, // only when setting values,
402401 error.SystemResources => unreachable, // memory already on the stack
403402 error.UnknownName => unreachable, // constant, known good value