emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/emacsql 3127283cd1 218/427: Clean up middleware a bit.


From: ELPA Syncer
Subject: [nongnu] elpa/emacsql 3127283cd1 218/427: Clean up middleware a bit.
Date: Tue, 13 Dec 2022 02:59:45 -0500 (EST)

branch: elpa/emacsql
commit 3127283cd10c527894a802355ae4b33b10f32e46
Author: Christopher Wellons <wellons@nullprogram.com>
Commit: Christopher Wellons <wellons@nullprogram.com>

    Clean up middleware a bit.
---
 sqlite/emacsql.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sqlite/emacsql.c b/sqlite/emacsql.c
index 28b5bae03f..bb163aa578 100644
--- a/sqlite/emacsql.c
+++ b/sqlite/emacsql.c
@@ -48,12 +48,6 @@ void buffer_free(buffer *buffer) {
     free(buffer);
 }
 
-#define CHECK(sqlitecall)                       \
-    if (sqlitecall != SQLITE_OK) {              \
-        send_error(sqlite3_errcode(db), sqlite3_errmsg(db));        \
-        continue;                                                   \
-    }
-
 int main(int argc, char **argv) {
     char *file = NULL;
     if (argc != 2) {
@@ -100,9 +94,15 @@ int main(int argc, char **argv) {
             continue;
         }
 
-        /* Run SQL and print rows. */
+        /* Parse SQL statement. */
         sqlite3_stmt *stmt = NULL;
-        CHECK(sqlite3_prepare_v2(db, input->buffer, length, &stmt, NULL));
+        result = sqlite3_prepare_v2(db, input->buffer, length, &stmt, NULL);
+        if (result != SQLITE_OK) {
+            send_error(sqlite3_errcode(db), sqlite3_errmsg(db));
+            continue;
+        }
+
+        /* Print out rows. */
         int ncolumns = sqlite3_column_count(stmt);
         printf("%d\n", ncolumns);
         while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -124,7 +124,7 @@ int main(int argc, char **argv) {
                            sqlite3_column_bytes(stmt, i), stdout);
                     break;
                 case SQLITE_BLOB:
-                    send_error(SQLITE_NOLFS, "blobs not supported by Emacsql");
+                    printf(" nil");
                     break;
                 }
             }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]