You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/02/17 21:19:05 UTC
svn commit: r1245738 - /subversion/trunk/subversion/libsvn_subr/sqlite.c
Author: danielsh
Date: Fri Feb 17 20:19:05 2012
New Revision: 1245738
URL: http://svn.apache.org/viewvc?rev=1245738&view=rev
Log:
State which library error messages come from, for SQLite. (This has previously
been done for SASL.)
* subversion/libsvn_subr/sqlite.c
(SQLITE_ERR, SQLITE_ERR_MSG): Precede "sqlite: " to the error.
The new output is:
subversion/libsvn_subr/sqlite.c:249: (apr_err=200030)
svn: E200030: disk I/O error
subversion/libsvn_subr/sqlite.c:579: (apr_err=200030)
svn: E200030: sqlite: disk I/O error
Modified:
subversion/trunk/subversion/libsvn_subr/sqlite.c
Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1245738&r1=1245737&r2=1245738&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Fri Feb 17 20:19:05 2012
@@ -120,16 +120,17 @@ struct svn_sqlite__value_t
{ \
int sqlite_err__temp = (x); \
if (sqlite_err__temp != SQLITE_OK) \
- return svn_error_create(SQLITE_ERROR_CODE(sqlite_err__temp), \
- NULL, sqlite3_errmsg((db)->db3)); \
+ return svn_error_createf(SQLITE_ERROR_CODE(sqlite_err__temp), \
+ NULL, "sqlite: %s", \
+ sqlite3_errmsg((db)->db3)); \
} while (0)
#define SQLITE_ERR_MSG(x, msg) do \
{ \
int sqlite_err__temp = (x); \
if (sqlite_err__temp != SQLITE_OK) \
- return svn_error_create(SQLITE_ERROR_CODE(sqlite_err__temp), \
- NULL, msg); \
+ return svn_error_createf(SQLITE_ERROR_CODE(sqlite_err__temp), \
+ NULL, "sqlite: %s", (msg)); \
} while (0)