diff options
| -rw-r--r-- | src/lib/vfs.zig | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/vfs.zig b/src/lib/vfs.zig index ccfd5ff..1ce8ad7 100644 --- a/src/lib/vfs.zig +++ b/src/lib/vfs.zig @@ -11,6 +11,7 @@ const sysexchange = @import("sysexchange.zig"); const Allocator = std.mem.Allocator; +const Result = sysexchange.Result; const TermHook = process.Info.TermHook; var root: Node = .{ @@ -57,8 +58,8 @@ pub const Stream = extern struct { readFn: ?ReadFn, writeFn: ?WriteFn, - pub const ReadFn = *const fn (ptr: [*]u8, len: usize) callconv(.C) sysexchange.Result(usize); - pub const WriteFn = *const fn (ptr: [*]const u8, len: usize) callconv(.C) sysexchange.Result(usize); + pub const ReadFn = *const fn (ptr: [*]u8, len: usize) callconv(.C) Result(usize); + pub const WriteFn = *const fn (ptr: [*]const u8, len: usize) callconv(.C) Result(usize); }; // A file is a resource that creates a unique data stream with a driver. @@ -68,8 +69,8 @@ pub const File = extern struct { closeFn: ?CloseFn, initializer: ?*anyopaque, - pub const ReadFn = *const fn (context: *FileContext, ptr: [*]u8, len: usize) callconv(.C) sysexchange.Result(usize); - pub const WriteFn = *const fn (context: *FileContext, ptr: [*]const u8, len: usize) callconv(.C) sysexchange.Result(usize); + pub const ReadFn = *const fn (context: *FileContext, ptr: [*]u8, len: usize) callconv(.C) Result(usize); + pub const WriteFn = *const fn (context: *FileContext, ptr: [*]const u8, len: usize) callconv(.C) Result(usize); pub const CloseFn = *const fn (context: *FileContext) callconv(.C) void; }; @@ -77,7 +78,7 @@ pub const File = extern struct { pub const Hook = extern struct { callback: Callback, - pub const Callback = *allowzero const fn (pid: u16, thread_id: usize, data: usize) callconv(.C) sysexchange.Result(usize); + pub const Callback = *allowzero const fn (pid: u16, thread_id: usize, data: usize) callconv(.C) Result(usize); }; // A directory hook is a resource that provides other resources via driver callbacks. @@ -87,10 +88,10 @@ pub const DirHook = extern struct { listFn: ListFn, removeFn: ?RemoveFn, - pub const ProvideFn = *const fn (name_ptr: [*]const u8, name_len: usize, inode: Inode) callconv(.C) sysexchange.Result(void); + pub const ProvideFn = *const fn (name_ptr: [*]const u8, name_len: usize, inode: Inode) callconv(.C) Result(void); pub const FindFn = *allowzero const fn (name_ptr: [*]const u8, name_len: usize) callconv(.C) ?*Inode; - pub const ListFn = *allowzero const fn (inodes_ptr: [*]Inode, inodes_len: usize) callconv(.C) sysexchange.Result(usize); - pub const RemoveFn = *const fn (name_ptr: [*]const u8, name_len: usize) callconv(.C) sysexchange.Result(void); + pub const ListFn = *allowzero const fn (inodes_ptr: [*]Inode, inodes_len: usize) callconv(.C) Result(usize); + pub const RemoveFn = *const fn (name_ptr: [*]const u8, name_len: usize) callconv(.C) Result(void); }; pub const FileContext = extern struct { @@ -341,7 +342,7 @@ pub const ResourceDescriptor = struct { pub const UserInfo = union(enum) { rd: ResourceDescriptor, - value: sysexchange.Result(usize), + value: Result(usize), }; pub fn init(allocator: Allocator) !void { |