syntax cosmetics

src/DB.zig

@@ -702,10 +702,10 @@ fn bdzIdx(
     keys: []const T,
     idx2offset: []const u32,
 ) error{OutOfMemory}![]align(8) const u32 {
-    const search_fn = switch (T) {
+    const search_fn = comptime switch (T) {
         u32 => bdz.search_u32,
         []const u8 => bdz.search,
-        else => unreachable,
+        else => @compileError("unexpected type " ++ @typeName(T)),
     };
     assert(keys.len <= math.maxInt(u32));
     var result = try allocator.alignedAlloc(u32, 8, keys.len);

src/Group.zig

@@ -74,7 +74,6 @@ pub fn fromReader(allocator: Allocator, reader: anytype) FromReaderError![]Group
 
     var i: usize = 0;
     while (true) : (i += 1) {
-        // TODO: catch and interpret different errors
         const max = std.math.maxInt(u32);
         reader.readUntilDelimiterArrayList(&line, '\n', max) catch |err| switch (err) {
             error.EndOfStream => break,

src/libnss.zig

@@ -220,7 +220,7 @@ fn getgrgid_r(
     const omit_members = state.omit_members;
 
     var buf = buffer[0..buflen];
-    var cgroup = db.getgrgid(gid, buf, omit_members) catch |err| switch (err) {
+    const cgroup = db.getgrgid(gid, buf, omit_members) catch |err| switch (err) {
         error.BufferTooSmall => {
             errnop.* = @enumToInt(os.E.RANGE);
             return c.NSS_STATUS_TRYAGAIN;
@@ -262,17 +262,16 @@ fn getgrnam_r(
     const omit_members = state.omit_members;
     const nameSlice = mem.sliceTo(name, 0);
     var buf = buffer[0..buflen];
-    var cgroup = db.getgrnam(nameSlice, buf, omit_members) catch |err| switch (err) {
+    const cgroup = db.getgrnam(nameSlice, buf, omit_members) catch |err| switch (err) {
         error.BufferTooSmall => {
             errnop.* = @enumToInt(os.E.RANGE);
             return c.NSS_STATUS_TRYAGAIN;
         },
     };
-    const got_cgroup = cgroup orelse {
+    group.* = cgroup orelse {
         errnop.* = @enumToInt(os.E.NOENT);
         return c.NSS_STATUS_NOTFOUND;
     };
-    group.* = got_cgroup;
     return c.NSS_STATUS_SUCCESS;
 }
 
@@ -286,11 +285,10 @@ fn setpwent(state: *State) c.enum_nss_status {
     state.getpwent_iterator_mu.lock();
     defer state.getpwent_iterator_mu.unlock();
 
-    const db = state.file.db;
     state.getpwent_iterator = PackedUser.iterator(
-        db.users,
-        db.header.num_users,
-        db.shellReader(),
+        state.file.db.users,
+        state.file.db.header.num_users,
+        state.file.db.shellReader(),
     );
     return c.NSS_STATUS_SUCCESS;
 }