code style
This commit is contained in:
@@ -66,32 +66,24 @@ fn execute(
|
||||
const groupFname = result.argFlag("--group") orelse "./group";
|
||||
const outFile = result.argFlag("--output") orelse "./db.turbo";
|
||||
|
||||
// to catch a specific file.OpenError, hold thumbs for
|
||||
// to catch an error set file.OpenError, wait for
|
||||
// https://github.com/ziglang/zig/issues/2473
|
||||
var errc = ErrCtx{};
|
||||
var passwdFile = fs.cwd().openFile(
|
||||
passwdFname,
|
||||
.{ .mode = .read_only },
|
||||
) catch |err| return fail(errc.wrapf("open {s}", .{passwdFname}), stderr, err);
|
||||
|
||||
var passwdFile = fs.cwd().openFile(passwdFname, .{ .mode = .read_only }) catch |err|
|
||||
return fail(errc.wrapf("open {s}", .{passwdFname}), stderr, err);
|
||||
defer passwdFile.close();
|
||||
|
||||
var groupFile = fs.cwd().openFile(groupFname, .{ .mode = .read_only }) catch |err|
|
||||
return fail(errc.wrapf("open {s}", .{groupFname}), stderr, err);
|
||||
defer groupFile.close();
|
||||
|
||||
var users = User.fromReader(
|
||||
allocator,
|
||||
&errc,
|
||||
passwdFile.reader(),
|
||||
) catch |err| return fail(errc.wrap("read users"), stderr, err);
|
||||
|
||||
var users = User.fromReader(allocator, &errc, passwdFile.reader()) catch |err|
|
||||
return fail(errc.wrap("read users"), stderr, err);
|
||||
defer for (users) |*user| user.deinit(allocator);
|
||||
defer allocator.free(users);
|
||||
|
||||
var groups = Group.fromReader(
|
||||
allocator,
|
||||
groupFile.reader(),
|
||||
) catch |err| return fail(errc.wrap("read groups"), stderr, err);
|
||||
var groups = Group.fromReader(allocator, groupFile.reader()) catch |err|
|
||||
return fail(errc.wrap("read groups"), stderr, err);
|
||||
defer for (groups) |*group| group.deinit(allocator);
|
||||
defer allocator.free(groups);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user