You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/07/02 06:00:50 UTC
svn commit: r1498772 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/sqlite.c
Author: svn-role
Date: Tue Jul 2 04:00:50 2013
New Revision: 1498772
URL: http://svn.apache.org/r1498772
Log:
Merge r1497804 from trunk:
* r1497804
sqlite error messages: change location of sqlite numeric error code.
Justification:
Make it clearer that 'S26' is an error code, rather than a parenthetical
description of the last word in the string sqlite3_errmsg() returned.
Votes:
+1: danielsh, stefan2, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/sqlite.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1497804
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1498772&r1=1498771&r2=1498772&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul 2 04:00:50 2013
@@ -198,11 +198,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1497804
- sqlite error messages: change location of sqlite numeric error code.
- Justification:
- Make it clearer that 'S26' is an error code, rather than a parenthetical
- description of the last word in the string sqlite3_errmsg() returned.
- Votes:
- +1: danielsh, stefan2, rhuijben
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/sqlite.c?rev=1498772&r1=1498771&r2=1498772&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/sqlite.c Tue Jul 2 04:00:50 2013
@@ -140,9 +140,9 @@ struct svn_sqlite__value_t
int sqlite_err__temp = (x); \
if (sqlite_err__temp != SQLITE_OK) \
return svn_error_createf(SQLITE_ERROR_CODE(sqlite_err__temp), \
- NULL, "sqlite: %s (S%d)", \
- sqlite3_errmsg((db)->db3), \
- sqlite_err__temp); \
+ NULL, "sqlite[S%d]: %s", \
+ sqlite_err__temp, \
+ sqlite3_errmsg((db)->db3)); \
} while (0)
#define SQLITE_ERR_MSG(x, msg) do \
@@ -150,8 +150,8 @@ struct svn_sqlite__value_t
int sqlite_err__temp = (x); \
if (sqlite_err__temp != SQLITE_OK) \
return svn_error_createf(SQLITE_ERROR_CODE(sqlite_err__temp), \
- NULL, "sqlite: %s (S%d)", (msg), \
- sqlite_err__temp); \
+ NULL, "sqlite[S%d]: %s", \
+ sqlite_err__temp, msg); \
} while (0)
@@ -173,9 +173,9 @@ exec_sql2(svn_sqlite__db_t *db, const ch
if (sqlite_err != SQLITE_OK && sqlite_err != ignored_err)
{
svn_error_t *err = svn_error_createf(SQLITE_ERROR_CODE(sqlite_err), NULL,
- _("sqlite: %s (S%d),"
+ _("sqlite[S%d]: %s,"
" executing statement '%s'"),
- err_msg, sqlite_err, sql);
+ sqlite_err, err_msg, sql);
sqlite3_free(err_msg);
return err;
}
@@ -292,8 +292,8 @@ svn_sqlite__step(svn_boolean_t *got_row,
svn_error_t *err1, *err2;
err1 = svn_error_createf(SQLITE_ERROR_CODE(sqlite_result), NULL,
- "sqlite: %s (S%d)",
- sqlite3_errmsg(stmt->db->db3), sqlite_result);
+ "sqlite[S%d]: %s",
+ sqlite_result, sqlite3_errmsg(stmt->db->db3));
err2 = svn_sqlite__reset(stmt);
return svn_error_compose_create(err1, err2);
}
@@ -744,7 +744,7 @@ init_sqlite(void *baton, apr_pool_t *poo
int err = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
if (err != SQLITE_OK && err != SQLITE_MISUSE)
return svn_error_createf(SQLITE_ERROR_CODE(err), NULL,
- _("Could not configure SQLite (S%d)"), err);
+ _("Could not configure SQLite [S%d]"), err);
}
SQLITE_ERR_MSG(sqlite3_initialize(), _("Could not initialize SQLite"));