Minor changes to the {,_}sqlcall macro.

diff --git a/sqlite3.h b/sqlite3.h
index b721343a7a0da202a423d27d364cb3d849be93b2..50c3bd571ab609479f6c9bbb7a6041cf0afea4fb 100644 (file)
--- a/sqlite3.h
+++ b/sqlite3.h
@@ -41,14 +41,12 @@
 #include <sqlite3.h>
 #include <string.h>
 
 #include <sqlite3.h>
 #include <string.h>
 

-#define sqlcall(expr) \
-    do { \
-        int _value = (expr); \
-        if (_value == 0 || (_value >= 100 && _value < 200)) \
-            break; \
-        fprintf(stderr, "%s(%u): sqlcall(%u:%s): %s\n", __FILE__, __LINE__, _value, #expr, sqlite3_errmsg(database_)); \
-        exit(1); \
-    } while (false)
+#define _sqlcall(expr) ({ \
+    __typeof__(expr) _value = (expr); \
+    if (_value != 0 && (_value < 100 || _value >= 200)) \
+        _assert(false, "_sqlcall(%u:%s): %s\n", _value, #expr, sqlite3_errmsg(database_)); \
+    _value; \
+})

 
 int sqlite3_bind_string(sqlite3_stmt *stmt, int n, const char *value) {
     if (value == NULL)
 
 int sqlite3_bind_string(sqlite3_stmt *stmt, int n, const char *value) {
     if (value == NULL)

diff --git a/stdlib.h b/stdlib.h
index 1129f7930daa36fd804b93c9db91b575705a6d47..021ae70202020649a8a45fc3aa64951745ad4a11 100644 (file)
--- a/stdlib.h
+++ b/stdlib.h
@@ -65,8 +65,8 @@
     } while (false)
 
 #define _syscall(expr) ({ \
     } while (false)
 
 #define _syscall(expr) ({ \

-    __typeof__(expr) value; \
-    do if ((long) (value = (expr)) != -1) \
+    __typeof__(expr) _value; \
+    do if ((long) (_value = (expr)) != -1) \

         break; \
     else switch (errno) { \
         case EINTR: \
         break; \
     else switch (errno) { \
         case EINTR: \


@@ -74,7 +74,7 @@
         default: \
             _assert(false); \
     } while (true); \
         default: \
             _assert(false); \
     } while (true); \

-    value; \
+    _value; \

 })
 
 #define _aprcall(expr) \
 })
 
 #define _aprcall(expr) \