From 21e8477b206c84f939f4b3dea8288a97474cce20 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann
Date: Tue, 7 Sep 2021 01:04:44 +0200
Subject: more minor cleanups

---
 sqlite.zig | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'sqlite.zig')

diff --git a/sqlite.zig b/sqlite.zig
index b6531f9..04a3b24 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -781,8 +781,7 @@ pub fn Iterator(comptime Type: type) type {
 
         // dupeWithSentinel is like dupe/dupeZ but allows for any sentinel value.
         fn dupeWithSentinel(comptime SliceType: type, allocator: *mem.Allocator, data: []const u8) !SliceType {
-            const type_info = @typeInfo(SliceType);
-            switch (type_info) {
+            switch (@typeInfo(SliceType)) {
                 .Pointer => |ptr_info| {
                     if (ptr_info.sentinel) |sentinel| {
                         const slice = try allocator.alloc(u8, data.len + 1);
@@ -857,10 +856,8 @@ pub fn Iterator(comptime Type: type) type {
                 @compileError("options passed to readPointer must have an allocator field");
             }
 
-            const type_info = @typeInfo(PointerType);
-
             var ret: PointerType = undefined;
-            switch (type_info) {
+            switch (@typeInfo(PointerType)) {
                 .Pointer => |ptr| {
                     switch (ptr.size) {
                         .One => {
@@ -887,14 +884,11 @@ pub fn Iterator(comptime Type: type) type {
                 @compileError("options passed to readOptional must be a struct");
             }
 
-            const i = @intCast(c_int, _i);
-            const type_info = @typeInfo(OptionalType);
-
             var ret: OptionalType = undefined;
-            switch (type_info) {
+            switch (@typeInfo(OptionalType)) {
                 .Optional => |opt| {
                     // Easy way to know if the column represents a null value.
-                    const value = c.sqlite3_column_value(self.stmt, i);
+                    const value = c.sqlite3_column_value(self.stmt, @intCast(c_int, _i));
                     const datatype = c.sqlite3_value_type(value);
 
                     if (datatype == c.SQLITE_NULL) {
-- 
cgit v1.2.3