diff options
Diffstat (limited to '9ns/src/fuse.zig')
| -rw-r--r-- | 9ns/src/fuse.zig | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/9ns/src/fuse.zig b/9ns/src/fuse.zig index 5f7b22a..b70365f 100644 --- a/9ns/src/fuse.zig +++ b/9ns/src/fuse.zig @@ -139,7 +139,7 @@ pub const InHeader = extern struct { padding: u16, pub fn op(h: InHeader) Opcode { - return @enumFromInt(h.opcode); + return @fromBackingInt(@intCast(h.opcode)); } }; @@ -254,7 +254,7 @@ pub const Kstatfs = extern struct { namelen: u32 = 0, frsize: u32 = 0, padding: u32 = 0, - spare: [6]u32 = [_]u32{0} ** 6, + spare: [6]u32 = @splat(0), }; pub const StatfsOut = extern struct { st: Kstatfs = .{} }; @@ -283,7 +283,7 @@ pub const InitOut = extern struct { flags2: u32 = 0, max_stack_depth: u32 = 0, request_timeout: u16 = 0, - unused: [11]u16 = [_]u16{0} ** 11, + unused: [11]u16 = @splat(0), }; /// Fixed 24-byte head of `fuse_dirent`; the name follows, padded to 8 bytes. @@ -395,7 +395,7 @@ pub fn reply(fd: i32, unique: u64, payloads: []const []const u8) Error!void { /// Error reply: an `OutHeader` carrying `-errno` and no payload. pub fn replyError(fd: i32, unique: u64, err: linux.E) Error!void { - const code: i32 = @intCast(@intFromEnum(err)); + const code: i32 = @intCast(@backingInt(err)); const header = OutHeader{ .len = @sizeOf(OutHeader), .@"error" = -code, .unique = unique }; var iov = [_]std.posix.iovec_const{.{ .base = @ptrCast(&header), .len = @sizeOf(OutHeader) }}; return writeAll(fd, &iov, 1, @sizeOf(OutHeader)); @@ -528,8 +528,8 @@ test "struct sizes match linux/fuse.h" { try testing.expectEqual(@as(usize, 40), @sizeOf(InHeader)); try testing.expectEqual(@as(usize, 64), @sizeOf(InitOut)); try testing.expectEqual(@as(usize, 24), @sizeOf(Dirent)); - try testing.expectEqual(@as(u32, 26), @intFromEnum(Opcode.init)); - try testing.expectEqual(Opcode.statx, @as(Opcode, @enumFromInt(52))); + try testing.expectEqual(@as(u32, 26), @backingInt(Opcode.init)); + try testing.expectEqual(Opcode.statx, @as(Opcode, @fromBackingInt(@intCast(52)))); } test "addDirent pads records to 8 bytes and refuses when full" { @@ -573,7 +573,7 @@ test "body/nameAfter/secondName on hand-built requests" { const name = "hello"; const hdr = InHeader{ .len = @intCast(@sizeOf(InHeader) + name.len + 1), - .opcode = @intFromEnum(Opcode.lookup), + .opcode = @backingInt(Opcode.lookup), .unique = 7, .nodeid = root_id, .uid = 1000, @@ -617,7 +617,7 @@ test "body/nameAfter/secondName on hand-built requests" { } test "initReply fields" { - var in = InitIn{ .major = 7, .minor = 45, .max_readahead = 131072, .flags = 0, .flags2 = 0, .unused = [_]u32{0} ** 11 }; + var in = InitIn{ .major = 7, .minor = 45, .max_readahead = 131072, .flags = 0, .flags2 = 0, .unused = @splat(0) }; const a = initReply(&in, 1 << 20); try testing.expectEqual(@as(u32, 7), a.major); try testing.expectEqual(@as(u32, 31), a.minor); @@ -696,7 +696,7 @@ test "replyError writes a negative errno" { try replyError(fds[1], 1, .NOSYS); try readExact(fds[0], &out); - try testing.expectEqual(-@as(i32, @intCast(@intFromEnum(linux.E.NOSYS))), std.mem.bytesToValue(OutHeader, &out).@"error"); + try testing.expectEqual(-@as(i32, @intCast(@backingInt(linux.E.NOSYS))), std.mem.bytesToValue(OutHeader, &out).@"error"); } test "readRequest parses one request from a pipe and rejects bad lengths" { @@ -705,7 +705,7 @@ test "readRequest parses one request from a pipe and rejects bad lengths" { defer _ = linux.close(fds[1]); var wire: [48]u8 align(8) = undefined; - const hdr = InHeader{ .len = 48, .opcode = @intFromEnum(Opcode.forget), .unique = 3, .nodeid = 2, .uid = 0, .gid = 0, .pid = 0, .total_extlen = 0, .padding = 0 }; + const hdr = InHeader{ .len = 48, .opcode = @backingInt(Opcode.forget), .unique = 3, .nodeid = 2, .uid = 0, .gid = 0, .pid = 0, .total_extlen = 0, .padding = 0 }; @memcpy(wire[0..40], std.mem.asBytes(&hdr)); @memcpy(wire[40..48], std.mem.asBytes(&ForgetIn{ .nlookup = 11 })); try testing.expectEqual(@as(usize, 48), linux.write(fds[1], &wire, wire.len)); |
