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 {...@@ -761,7 +761,7 @@ const PosixThreadImpl = struct {
761 var count_len: usize = @sizeOf(c_int);761 var count_len: usize = @sizeOf(c_int);
762 const name = if (comptime target.os.tag.isDarwin()) "hw.logicalcpu" else "hw.ncpu";762 const name = if (comptime target.os.tag.isDarwin()) "hw.logicalcpu" else "hw.ncpu";
763 posix.sysctlbynameZ(name, &count, &count_len, null, 0) catch |err| switch (err) {763 posix.sysctlbynameZ(name, &count, &count_len, null, 0) catch |err| switch (err) {
764 error.NameTooLong, error.UnknownName => unreachable,764 error.UnknownName => unreachable,
765 else => |e| return e,765 else => |e| return e,
766 };766 };
767 return @as(usize, @intCast(count));767 return @as(usize, @intCast(count));
lib/std/posix.zig+7-1
...@@ -5291,13 +5291,19 @@ pub fn sysctl(...@@ -5291,13 +5291,19 @@ pub fn sysctl(
5291 }5291 }
5292}5292}
52935293
5294pub const SysCtlByNameError = error{
5295 PermissionDenied,
5296 SystemResources,
5297 UnknownName,
5298} || UnexpectedError;
5299
5294pub fn sysctlbynameZ(5300pub fn sysctlbynameZ(
5295 name: [*:0]const u8,5301 name: [*:0]const u8,
5296 oldp: ?*anyopaque,5302 oldp: ?*anyopaque,
5297 oldlenp: ?*usize,5303 oldlenp: ?*usize,
5298 newp: ?*anyopaque,5304 newp: ?*anyopaque,
5299 newlen: usize,5305 newlen: usize,
5300) SysCtlError!void {5306) SysCtlByNameError!void {
5301 if (native_os == .wasi) {5307 if (native_os == .wasi) {
5302 @compileError("sysctl not supported on WASI");5308 @compileError("sysctl not supported on WASI");
5303 }5309 }
lib/std/process.zig+1-1
...@@ -1759,7 +1759,7 @@ pub fn totalSystemMemory() TotalSystemMemoryError!u64 {...@@ -1759,7 +1759,7 @@ pub fn totalSystemMemory() TotalSystemMemoryError!u64 {
1759 var physmem: c_ulong = undefined;1759 var physmem: c_ulong = undefined;
1760 var len: usize = @sizeOf(c_ulong);1760 var len: usize = @sizeOf(c_ulong);
1761 posix.sysctlbynameZ("hw.physmem", &physmem, &len, null, 0) catch |err| switch (err) {1761 posix.sysctlbynameZ("hw.physmem", &physmem, &len, null, 0) catch |err| switch (err) {
1762 error.NameTooLong, error.UnknownName => unreachable,1762 error.UnknownName => unreachable,
1763 else => return error.UnknownTotalSystemMemory,1763 else => return error.UnknownTotalSystemMemory,
1764 };1764 };
1765 return @as(usize, @intCast(physmem));1765 return @as(usize, @intCast(physmem));
lib/std/zig/system.zig-1
...@@ -228,7 +228,6 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {...@@ -228,7 +228,6 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
228 var len: usize = @sizeOf(@TypeOf(value));228 var len: usize = @sizeOf(@TypeOf(value));
229229
230 posix.sysctlbynameZ(key, &value, &len, null, 0) catch |err| switch (err) {230 posix.sysctlbynameZ(key, &value, &len, null, 0) catch |err| switch (err) {
231 error.NameTooLong => unreachable, // constant, known good value
232 error.PermissionDenied => unreachable, // only when setting values,231 error.PermissionDenied => unreachable, // only when setting values,
233 error.SystemResources => unreachable, // memory already on the stack232 error.SystemResources => unreachable, // memory already on the stack
234 error.UnknownName => unreachable, // constant, known good value233 error.UnknownName => unreachable, // constant, known good value
lib/std/zig/system/darwin/macos.zig-1
...@@ -397,7 +397,6 @@ pub fn detectNativeCpuAndFeatures() ?Target.Cpu {...@@ -397,7 +397,6 @@ pub fn detectNativeCpuAndFeatures() ?Target.Cpu {
397 var cpu_family: std.c.CPUFAMILY = undefined;397 var cpu_family: std.c.CPUFAMILY = undefined;
398 var len: usize = @sizeOf(std.c.CPUFAMILY);398 var len: usize = @sizeOf(std.c.CPUFAMILY);
399 std.posix.sysctlbynameZ("hw.cpufamily", &cpu_family, &len, null, 0) catch |err| switch (err) {399 std.posix.sysctlbynameZ("hw.cpufamily", &cpu_family, &len, null, 0) catch |err| switch (err) {
400 error.NameTooLong => unreachable, // constant, known good value
401 error.PermissionDenied => unreachable, // only when setting values,400 error.PermissionDenied => unreachable, // only when setting values,
402 error.SystemResources => unreachable, // memory already on the stack401 error.SystemResources => unreachable, // memory already on the stack
403 error.UnknownName => unreachable, // constant, known good value402 error.UnknownName => unreachable, // constant, known good value