procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor improvements in sqlite.c

Browse source 
* src/sqlite.c (Fsqlite_next): Doc fix.  Return nil if SQLITE_DONE
was once seen for this statement.  (Bug#61151)
(row_to_value): Cons the value in reverse, to avoid the Fnreverse
call.  Patch by Helmut Eller <eller.helmut@gmail.com>.
(Bug#61165)
This commit is contained in:
Eli Zaretskii 2023-02-02 21:45:44 +02:00
parent 3b3c47d977
commit 20454128b8
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/sqlite.c
View file

@ -399,7 +399,7 @@ row_to_value (sqlite3_stmt *stmt)
int len = sqlite3_column_count (stmt); int len = sqlite3_column_count (stmt);
Lisp_Object values = Qnil; Lisp_Object values = Qnil;
for (int i = 0; i < len; ++i) for (int i = len - 1; i >= 0; i--)
{ {
Lisp_Object v = Qnil; Lisp_Object v = Qnil;
@ -434,7 +434,7 @@ row_to_value (sqlite3_stmt *stmt)
values = Fcons (v, values); values = Fcons (v, values);
} }
return Fnreverse (values); return values;
} }
static Lisp_Object static Lisp_Object
@ -718,11 +718,15 @@ Only modules on Emacs' list of allowed modules can be loaded. */)
#endif /* HAVE_SQLITE3_LOAD_EXTENSION */ #endif /* HAVE_SQLITE3_LOAD_EXTENSION */
DEFUN ("sqlite-next", Fsqlite_next, Ssqlite_next, 1, 1, 0, DEFUN ("sqlite-next", Fsqlite_next, Ssqlite_next, 1, 1, 0,
doc: /* Return the next result set from SET. */) doc: /* Return the next result set from SET.
Return nil when the statement has finished executing successfully. */)
(Lisp_Object set) (Lisp_Object set)
{ {
check_sqlite (set, true); check_sqlite (set, true);
if (XSQLITE (set)->eof)
return Qnil;
int ret = sqlite3_step (XSQLITE (set)->stmt); int ret = sqlite3_step (XSQLITE (set)->stmt);
if (ret != SQLITE_ROW && ret != SQLITE_OK && ret != SQLITE_DONE) if (ret != SQLITE_ROW && ret != SQLITE_OK && ret != SQLITE_DONE)
xsignal1 (Qsqlite_error, build_string (sqlite3_errmsg (XSQLITE (set)->db))); xsignal1 (Qsqlite_error, build_string (sqlite3_errmsg (XSQLITE (set)->db)));