Commit 01b5023868

Sardorbek Imomaliev <3041675+imomaliev@users.noreply.github.com>
2025-08-21 12:36:57
drop NameTooLong from sysctlbynameZ error set (#24909)
1 parent cab6d75
Changed files (5)
lib/std/zig/system/darwin/macos.zig
@@ -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
lib/std/zig/system.zig
@@ -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
lib/std/posix.zig
@@ -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");
     }
lib/std/process.zig
@@ -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));
lib/std/Thread.zig
@@ -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));