From 512cb22d838adb7fc52c2b8b6c14d16a624d8605 Mon Sep 17 00:00:00 2001 From: mlugg Date: Mon, 16 Dec 2024 14:52:45 +0000 Subject: [PATCH] std.c.darwin.posix_spawn: fix signature And change corresponding signature in `DarwinPosixSpawn`. --- lib/std/c/darwin.zig | 8 ++++---- src/DarwinPosixSpawn.zig | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig index ef128beaeb..355ea8b11c 100644 --- a/lib/std/c/darwin.zig +++ b/lib/std/c/darwin.zig @@ -1232,16 +1232,16 @@ pub extern "c" fn posix_spawn( path: [*:0]const u8, actions: ?*const posix_spawn_file_actions_t, attr: ?*const posix_spawnattr_t, - argv: [*:null]?[*:0]const u8, - env: [*:null]?[*:0]const u8, + argv: [*:null]const ?[*:0]const u8, + env: [*:null]const ?[*:0]const u8, ) c_int; pub extern "c" fn posix_spawnp( pid: *pid_t, path: [*:0]const u8, actions: ?*const posix_spawn_file_actions_t, attr: ?*const posix_spawnattr_t, - argv: [*:null]?[*:0]const u8, - env: [*:null]?[*:0]const u8, + argv: [*:null]const ?[*:0]const u8, + env: [*:null]const ?[*:0]const u8, ) c_int; pub const E = enum(u16) { diff --git a/src/DarwinPosixSpawn.zig b/src/DarwinPosixSpawn.zig index eaca944241..aaf2df6ec3 100644 --- a/src/DarwinPosixSpawn.zig +++ b/src/DarwinPosixSpawn.zig @@ -161,8 +161,8 @@ pub fn spawn( path: []const u8, actions: ?Actions, attr: ?Attr, - argv: [*:null]?[*:0]const u8, - envp: [*:null]?[*:0]const u8, + argv: [*:null]const ?[*:0]const u8, + envp: [*:null]const ?[*:0]const u8, ) Error!std.c.pid_t { const posix_path = try std.posix.toPosixPath(path); return spawnZ(&posix_path, actions, attr, argv, envp); @@ -172,8 +172,8 @@ pub fn spawnZ( path: [*:0]const u8, actions: ?Actions, attr: ?Attr, - argv: [*:null]?[*:0]const u8, - envp: [*:null]?[*:0]const u8, + argv: [*:null]const ?[*:0]const u8, + envp: [*:null]const ?[*:0]const u8, ) Error!std.c.pid_t { var pid: std.c.pid_t = undefined; switch (errno(std.c.posix_spawn(