diff options
author | Himbeer <himbeer@disroot.org> | 2024-07-02 14:46:40 +0200 |
---|---|---|
committer | Himbeer <himbeer@disroot.org> | 2024-07-02 14:46:40 +0200 |
commit | 1ed966bc6bfd9c8653441d1da58a320e490ec7fe (patch) | |
tree | 2cd5431eb7417c31b4369c40d1a4d29d149258ac /src | |
parent | bcd1b2bb2d80e0e5c4f87507ae9fb5759e06d7c7 (diff) |
syscall: Rename null-terminated / C path strings to path_c
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/syscall.zig | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/syscall.zig b/src/lib/syscall.zig index d7bcd51..37cfb00 100644 --- a/src/lib/syscall.zig +++ b/src/lib/syscall.zig @@ -43,12 +43,12 @@ fn uprint(trap_frame: *const trap.Frame) void { w.print("User message: {s}\r\n", .{str}) catch unreachable; } -// open(path: [*:0]const u8, data: usize) Result(usize) // fixme: Kernel panic if null pointer +// open(path_c: [*:0]const u8, data: usize) Result(usize) // fixme: Kernel panic if null pointer fn open(proc: *process.Info, trap_frame: *trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); const data = trap_frame.general_purpose_registers[11]; - const user_info = vfs.openZ(path, proc.id, data) catch |err| { + const user_info = vfs.openZ(path_c, proc.id, data) catch |err| { sysexchange.frameReturn(usize, trap_frame, err); return; }; @@ -68,16 +68,16 @@ fn close(proc: *process.Info, trap_frame: *const trap.Frame) void { } // provideStream( -// path: [*:0]const u8, // fixme: Kernel panic if null pointer +// path_c: [*:0]const u8, // fixme: Kernel panic if null pointer // readFn: ?vfs.Stream.ReadFn, // writeFn: ?vfs.Stream.WriteFn, // ) Result(void) fn provideStream(trap_frame: *trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); const readFn: ?vfs.Stream.ReadFn = @ptrFromInt(trap_frame.general_purpose_registers[11]); const writeFn: ?vfs.Stream.WriteFn = @ptrFromInt(trap_frame.general_purpose_registers[12]); - sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path, .{ + sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path_c, .{ .stream = .{ .readFn = readFn, .writeFn = writeFn, @@ -86,20 +86,20 @@ fn provideStream(trap_frame: *trap.Frame) void { } // provideFile( -// path: [*:0]const u8, // fixme: Kernel panic if null pointer +// path_c: [*:0]const u8, // fixme: Kernel panic if null pointer // openFn: vfs.File.OpenFn, // readFn: ?vfs.File.ReadFn, // writeFn: ?vfs.File.WriteFn, // closeFn: ?vfs.File.CloseFn, // ) Result(void) fn provideFile(trap_frame: *trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); const openFn: vfs.File.OpenFn = @ptrFromInt(trap_frame.general_purpose_registers[11]); const readFn: ?vfs.File.ReadFn = @ptrFromInt(trap_frame.general_purpose_registers[12]); const writeFn: ?vfs.File.WriteFn = @ptrFromInt(trap_frame.general_purpose_registers[13]); const closeFn: ?vfs.File.CloseFn = @ptrFromInt(trap_frame.general_purpose_registers[14]); - sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path, .{ + sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path_c, .{ .file = .{ .openFn = openFn, .readFn = readFn, @@ -110,14 +110,14 @@ fn provideFile(trap_frame: *trap.Frame) void { } // provideHook( -// path: [*:0]const u8, // fixme: Kernel panic if null pointer +// path_c: [*:0]const u8, // fixme: Kernel panic if null pointer // callback: vfs.Hook.Callback, // ) Result(void) fn provideHook(trap_frame: *trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); const callback: vfs.Hook.Callback = @ptrFromInt(trap_frame.general_purpose_registers[11]); - sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path, .{ + sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path_c, .{ .hook = .{ .callback = callback, }, @@ -125,31 +125,31 @@ fn provideHook(trap_frame: *trap.Frame) void { } // mkdir( -// path: [*:0]const u8, // fixme: Kernel panic if null pointer +// path_c: [*:0]const u8, // fixme: Kernel panic if null pointer // options: vfs.MkdirOptions, // ) Result(void) fn mkdir(trap_frame: *trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); const options: vfs.MkdirOptions = @bitCast(trap_frame.general_purpose_registers[11]); - _ = path; + _ = path_c; _ = options; unreachable; } // provideDirHook( -// path: [*:0]const u8, // fixme: Kernel panic if null pointer +// path_c: [*:0]const u8, // fixme: Kernel panic if null pointer // provideFn: vfs.DirHook.ProvideFn, // findFn: vfs.DirHook.FindFn, // removeFn: vfs.DirHook.RemoveFn, // ) Result(void) fn provideDirHook(trap_frame: *trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); const provideFn: vfs.DirHook.ProvideFn = @ptrFromInt(trap_frame.general_purpose_registers[11]); const findFn: vfs.DirHook.FindFn = @ptrFromInt(trap_frame.general_purpose_registers[12]); const removeFn: vfs.DirHook.RemoveFn = @ptrFromInt(trap_frame.general_purpose_registers[13]); - sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path, .{ + sysexchange.frameReturn(null, trap_frame, vfs.provideResourceZ(path_c, .{ .dir_hook = .{ .provideFn = provideFn, .findFn = findFn, @@ -158,11 +158,11 @@ fn provideDirHook(trap_frame: *trap.Frame) void { })); } -// remove(path: [*:0]const u8) Result(void) // fixme: Kernel panic if null pointer +// remove(path_c: [*:0]const u8) Result(void) // fixme: Kernel panic if null pointer fn remove(trap_frame: *const trap.Frame) void { - const path: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); + const path_c: [*:0]const u8 = @ptrFromInt(trap_frame.general_purpose_registers[10]); - _ = path; + _ = path_c; unreachable; } |