From 9bcd77a75e2f6757706dc2e4d2fb59d5f4a35b7c Mon Sep 17 00:00:00 2001 From: daurnimator Date: Fri, 23 Apr 2021 00:30:51 +1000 Subject: error: return error directly so that line in stacktrace is relevant --- error.zig | 174 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 87 insertions(+), 87 deletions(-) (limited to 'error.zig') diff --git a/error.zig b/error.zig index eb2f00c..cad107b 100644 --- a/error.zig +++ b/error.zig @@ -167,102 +167,102 @@ pub fn errorFromResultCode(code: c_int) Error { } } - return switch (code) { - c.SQLITE_ERROR => error.SQLiteError, - c.SQLITE_INTERNAL => error.SQLiteInternal, - c.SQLITE_PERM => error.SQLitePerm, - c.SQLITE_ABORT => error.SQLiteAbort, - c.SQLITE_BUSY => error.SQLiteBusy, - c.SQLITE_LOCKED => error.SQLiteLocked, - c.SQLITE_NOMEM => error.SQLiteNoMem, - c.SQLITE_READONLY => error.SQLiteReadOnly, - c.SQLITE_INTERRUPT => error.SQLiteInterrupt, - c.SQLITE_IOERR => error.SQLiteIOErr, - c.SQLITE_CORRUPT => error.SQLiteCorrupt, - c.SQLITE_NOTFOUND => error.SQLiteNotFound, - c.SQLITE_FULL => error.SQLiteFull, - c.SQLITE_CANTOPEN => error.SQLiteCantOpen, - c.SQLITE_PROTOCOL => error.SQLiteProtocol, - c.SQLITE_EMPTY => error.SQLiteEmpty, - c.SQLITE_SCHEMA => error.SQLiteSchema, - c.SQLITE_TOOBIG => error.SQLiteTooBig, - c.SQLITE_CONSTRAINT => error.SQLiteConstraint, - c.SQLITE_MISMATCH => error.SQLiteMismatch, - c.SQLITE_MISUSE => error.SQLiteMisuse, - c.SQLITE_NOLFS => error.SQLiteNoLFS, - c.SQLITE_AUTH => error.SQLiteAuth, - c.SQLITE_RANGE => error.SQLiteRange, - c.SQLITE_NOTADB => error.SQLiteNotADatabase, - c.SQLITE_NOTICE => error.SQLiteNotice, - c.SQLITE_WARNING => error.SQLiteWarning, + switch (code) { + c.SQLITE_ERROR => return error.SQLiteError, + c.SQLITE_INTERNAL => return error.SQLiteInternal, + c.SQLITE_PERM => return error.SQLitePerm, + c.SQLITE_ABORT => return error.SQLiteAbort, + c.SQLITE_BUSY => return error.SQLiteBusy, + c.SQLITE_LOCKED => return error.SQLiteLocked, + c.SQLITE_NOMEM => return error.SQLiteNoMem, + c.SQLITE_READONLY => return error.SQLiteReadOnly, + c.SQLITE_INTERRUPT => return error.SQLiteInterrupt, + c.SQLITE_IOERR => return error.SQLiteIOErr, + c.SQLITE_CORRUPT => return error.SQLiteCorrupt, + c.SQLITE_NOTFOUND => return error.SQLiteNotFound, + c.SQLITE_FULL => return error.SQLiteFull, + c.SQLITE_CANTOPEN => return error.SQLiteCantOpen, + c.SQLITE_PROTOCOL => return error.SQLiteProtocol, + c.SQLITE_EMPTY => return error.SQLiteEmpty, + c.SQLITE_SCHEMA => return error.SQLiteSchema, + c.SQLITE_TOOBIG => return error.SQLiteTooBig, + c.SQLITE_CONSTRAINT => return error.SQLiteConstraint, + c.SQLITE_MISMATCH => return error.SQLiteMismatch, + c.SQLITE_MISUSE => return error.SQLiteMisuse, + c.SQLITE_NOLFS => return error.SQLiteNoLFS, + c.SQLITE_AUTH => return error.SQLiteAuth, + c.SQLITE_RANGE => return error.SQLiteRange, + c.SQLITE_NOTADB => return error.SQLiteNotADatabase, + c.SQLITE_NOTICE => return error.SQLiteNotice, + c.SQLITE_WARNING => return error.SQLiteWarning, - c.SQLITE_ERROR_MISSING_COLLSEQ => error.SQLiteErrorMissingCollSeq, - c.SQLITE_ERROR_RETRY => error.SQLiteErrorRetry, + c.SQLITE_ERROR_MISSING_COLLSEQ => return error.SQLiteErrorMissingCollSeq, + c.SQLITE_ERROR_RETRY => return error.SQLiteErrorRetry, - c.SQLITE_IOERR_READ => error.SQLiteIOErrRead, - c.SQLITE_IOERR_SHORT_READ => error.SQLiteIOErrShortRead, - c.SQLITE_IOERR_WRITE => error.SQLiteIOErrWrite, - c.SQLITE_IOERR_FSYNC => error.SQLiteIOErrFsync, - c.SQLITE_IOERR_DIR_FSYNC => error.SQLiteIOErrDirFsync, - c.SQLITE_IOERR_TRUNCATE => error.SQLiteIOErrTruncate, - c.SQLITE_IOERR_FSTAT => error.SQLiteIOErrFstat, - c.SQLITE_IOERR_UNLOCK => error.SQLiteIOErrUnlock, - c.SQLITE_IOERR_RDLOCK => error.SQLiteIOErrRDLock, - c.SQLITE_IOERR_DELETE => error.SQLiteIOErrDelete, - c.SQLITE_IOERR_BLOCKED => error.SQLiteIOErrBlocked, - c.SQLITE_IOERR_NOMEM => error.SQLiteIOErrNoMem, - c.SQLITE_IOERR_ACCESS => error.SQLiteIOErrAccess, - c.SQLITE_IOERR_CHECKRESERVEDLOCK => error.SQLiteIOErrCheckReservedLock, - c.SQLITE_IOERR_LOCK => error.SQLiteIOErrLock, - c.SQLITE_IOERR_CLOSE => error.SQLiteIOErrClose, - c.SQLITE_IOERR_DIR_CLOSE => error.SQLiteIOErrDirClose, - c.SQLITE_IOERR_SHMOPEN => error.SQLiteIOErrSHMOpen, - c.SQLITE_IOERR_SHMSIZE => error.SQLiteIOErrSHMSize, - c.SQLITE_IOERR_SHMLOCK => error.SQLiteIOErrSHMLock, - c.SQLITE_IOERR_SHMMAP => error.SQLiteIOErrSHMMap, - c.SQLITE_IOERR_SEEK => error.SQLiteIOErrSeek, - c.SQLITE_IOERR_DELETE_NOENT => error.SQLiteIOErrDeleteNoEnt, - c.SQLITE_IOERR_MMAP => error.SQLiteIOErrMmap, - c.SQLITE_IOERR_GETTEMPPATH => error.SQLiteIOErrGetTempPath, - c.SQLITE_IOERR_CONVPATH => error.SQLiteIOErrConvPath, - c.SQLITE_IOERR_VNODE => error.SQLiteIOErrVnode, - c.SQLITE_IOERR_AUTH => error.SQLiteIOErrAuth, - c.SQLITE_IOERR_BEGIN_ATOMIC => error.SQLiteIOErrBeginAtomic, - c.SQLITE_IOERR_COMMIT_ATOMIC => error.SQLiteIOErrCommitAtomic, - c.SQLITE_IOERR_ROLLBACK_ATOMIC => error.SQLiteIOErrRollbackAtomic, + c.SQLITE_IOERR_READ => return error.SQLiteIOErrRead, + c.SQLITE_IOERR_SHORT_READ => return error.SQLiteIOErrShortRead, + c.SQLITE_IOERR_WRITE => return error.SQLiteIOErrWrite, + c.SQLITE_IOERR_FSYNC => return error.SQLiteIOErrFsync, + c.SQLITE_IOERR_DIR_FSYNC => return error.SQLiteIOErrDirFsync, + c.SQLITE_IOERR_TRUNCATE => return error.SQLiteIOErrTruncate, + c.SQLITE_IOERR_FSTAT => return error.SQLiteIOErrFstat, + c.SQLITE_IOERR_UNLOCK => return error.SQLiteIOErrUnlock, + c.SQLITE_IOERR_RDLOCK => return error.SQLiteIOErrRDLock, + c.SQLITE_IOERR_DELETE => return error.SQLiteIOErrDelete, + c.SQLITE_IOERR_BLOCKED => return error.SQLiteIOErrBlocked, + c.SQLITE_IOERR_NOMEM => return error.SQLiteIOErrNoMem, + c.SQLITE_IOERR_ACCESS => return error.SQLiteIOErrAccess, + c.SQLITE_IOERR_CHECKRESERVEDLOCK => return error.SQLiteIOErrCheckReservedLock, + c.SQLITE_IOERR_LOCK => return error.SQLiteIOErrLock, + c.SQLITE_IOERR_CLOSE => return error.SQLiteIOErrClose, + c.SQLITE_IOERR_DIR_CLOSE => return error.SQLiteIOErrDirClose, + c.SQLITE_IOERR_SHMOPEN => return error.SQLiteIOErrSHMOpen, + c.SQLITE_IOERR_SHMSIZE => return error.SQLiteIOErrSHMSize, + c.SQLITE_IOERR_SHMLOCK => return error.SQLiteIOErrSHMLock, + c.SQLITE_IOERR_SHMMAP => return error.SQLiteIOErrSHMMap, + c.SQLITE_IOERR_SEEK => return error.SQLiteIOErrSeek, + c.SQLITE_IOERR_DELETE_NOENT => return error.SQLiteIOErrDeleteNoEnt, + c.SQLITE_IOERR_MMAP => return error.SQLiteIOErrMmap, + c.SQLITE_IOERR_GETTEMPPATH => return error.SQLiteIOErrGetTempPath, + c.SQLITE_IOERR_CONVPATH => return error.SQLiteIOErrConvPath, + c.SQLITE_IOERR_VNODE => return error.SQLiteIOErrVnode, + c.SQLITE_IOERR_AUTH => return error.SQLiteIOErrAuth, + c.SQLITE_IOERR_BEGIN_ATOMIC => return error.SQLiteIOErrBeginAtomic, + c.SQLITE_IOERR_COMMIT_ATOMIC => return error.SQLiteIOErrCommitAtomic, + c.SQLITE_IOERR_ROLLBACK_ATOMIC => return error.SQLiteIOErrRollbackAtomic, - c.SQLITE_LOCKED_SHAREDCACHE => error.SQLiteLockedSharedCache, + c.SQLITE_LOCKED_SHAREDCACHE => return error.SQLiteLockedSharedCache, - c.SQLITE_BUSY_RECOVERY => error.SQLiteBusyRecovery, - c.SQLITE_BUSY_SNAPSHOT => error.SQLiteBusySnapshot, + c.SQLITE_BUSY_RECOVERY => return error.SQLiteBusyRecovery, + c.SQLITE_BUSY_SNAPSHOT => return error.SQLiteBusySnapshot, - c.SQLITE_CANTOPEN_NOTEMPDIR => error.SQLiteCantOpenNoTempDir, - c.SQLITE_CANTOPEN_ISDIR => error.SQLiteCantOpenIsDir, - c.SQLITE_CANTOPEN_FULLPATH => error.SQLiteCantOpenFullPath, - c.SQLITE_CANTOPEN_CONVPATH => error.SQLiteCantOpenConvPath, + c.SQLITE_CANTOPEN_NOTEMPDIR => return error.SQLiteCantOpenNoTempDir, + c.SQLITE_CANTOPEN_ISDIR => return error.SQLiteCantOpenIsDir, + c.SQLITE_CANTOPEN_FULLPATH => return error.SQLiteCantOpenFullPath, + c.SQLITE_CANTOPEN_CONVPATH => return error.SQLiteCantOpenConvPath, - c.SQLITE_CORRUPT_VTAB => error.SQLiteCorruptVTab, + c.SQLITE_CORRUPT_VTAB => return error.SQLiteCorruptVTab, - c.SQLITE_READONLY_RECOVERY => error.SQLiteReadOnlyRecovery, - c.SQLITE_READONLY_CANTLOCK => error.SQLiteReadOnlyCantLock, - c.SQLITE_READONLY_ROLLBACK => error.SQLiteReadOnlyRollback, - c.SQLITE_READONLY_DBMOVED => error.SQLiteReadOnlyDBMoved, - c.SQLITE_READONLY_CANTINIT => error.SQLiteReadOnlyCantInit, - c.SQLITE_READONLY_DIRECTORY => error.SQLiteReadOnlyDirectory, + c.SQLITE_READONLY_RECOVERY => return error.SQLiteReadOnlyRecovery, + c.SQLITE_READONLY_CANTLOCK => return error.SQLiteReadOnlyCantLock, + c.SQLITE_READONLY_ROLLBACK => return error.SQLiteReadOnlyRollback, + c.SQLITE_READONLY_DBMOVED => return error.SQLiteReadOnlyDBMoved, + c.SQLITE_READONLY_CANTINIT => return error.SQLiteReadOnlyCantInit, + c.SQLITE_READONLY_DIRECTORY => return error.SQLiteReadOnlyDirectory, - c.SQLITE_ABORT_ROLLBACK => error.SQLiteAbortRollback, + c.SQLITE_ABORT_ROLLBACK => return error.SQLiteAbortRollback, - c.SQLITE_CONSTRAINT_CHECK => error.SQLiteConstraintCheck, - c.SQLITE_CONSTRAINT_COMMITHOOK => error.SQLiteConstraintCommitHook, - c.SQLITE_CONSTRAINT_FOREIGNKEY => error.SQLiteConstraintForeignKey, - c.SQLITE_CONSTRAINT_FUNCTION => error.SQLiteConstraintFunction, - c.SQLITE_CONSTRAINT_NOTNULL => error.SQLiteConstraintNotNull, - c.SQLITE_CONSTRAINT_PRIMARYKEY => error.SQLiteConstraintPrimaryKey, - c.SQLITE_CONSTRAINT_TRIGGER => error.SQLiteConstraintTrigger, - c.SQLITE_CONSTRAINT_UNIQUE => error.SQLiteConstraintUnique, - c.SQLITE_CONSTRAINT_VTAB => error.SQLiteConstraintVTab, - c.SQLITE_CONSTRAINT_ROWID => error.SQLiteConstraintRowID, + c.SQLITE_CONSTRAINT_CHECK => return error.SQLiteConstraintCheck, + c.SQLITE_CONSTRAINT_COMMITHOOK => return error.SQLiteConstraintCommitHook, + c.SQLITE_CONSTRAINT_FOREIGNKEY => return error.SQLiteConstraintForeignKey, + c.SQLITE_CONSTRAINT_FUNCTION => return error.SQLiteConstraintFunction, + c.SQLITE_CONSTRAINT_NOTNULL => return error.SQLiteConstraintNotNull, + c.SQLITE_CONSTRAINT_PRIMARYKEY => return error.SQLiteConstraintPrimaryKey, + c.SQLITE_CONSTRAINT_TRIGGER => return error.SQLiteConstraintTrigger, + c.SQLITE_CONSTRAINT_UNIQUE => return error.SQLiteConstraintUnique, + c.SQLITE_CONSTRAINT_VTAB => return error.SQLiteConstraintVTab, + c.SQLITE_CONSTRAINT_ROWID => return error.SQLiteConstraintRowID, else => std.debug.panic("invalid result code {}", .{code}), - }; + } } -- cgit v1.2.3