Avoid compiler warnings by only enabling sqlite3ErrName() when

SQLITE_TEST is defined.

FossilOrigin-Name: 862228e50534a6b89c9498c4db664610db11485e

diff --git a/manifest b/manifest
index 4d7a6ae0c869d765923c2ce3e4d7b26886a38963..adef4b0eac2fa2a90a3e3248edc4da9d3be44237 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sFTS4.\s\sThis\sinvolved\scorrupting\nMartin\sPorter's\sbeautifully\swritten\sand\selegant\sstemmer\scode,\smaking\sit\na\slittle\sless\sbeautiful\sand\sa\slittle\sless\selegant.\s\sToday\sis\sa\ssad\nday.\s\sBut\sthe\swarnings\sfrom\sGCC\sgrow\sincreasingly\sverbose\sand\sirksome\nwith\seach\snew\srelease\sand\sso\ssomething\shad\sto\sbe\sdone.
-D 2013-12-21T16:06:47.439
+C Avoid\scompiler\swarnings\sby\sonly\senabling\ssqlite3ErrName()\swhen\nSQLITE_TEST\sis\sdefined.
+D 2013-12-21T17:07:13.208
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -188,7 +188,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
 F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
-F src/main.c 3f00c4adfb5e5dc35b475dbdd475aba83ccf3d17
+F src/main.c 5307601c58b6e08153a15846098399a59c166d8d
 F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@ -224,7 +224,7 @@ F src/shell.c a3541193d5fce37e91dad8ef46a9505aa7c9b344
 F src/sqlite.h.in 4ef56464aeaa3785a2c5ca37fb3a0fb229d68b2e
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h d0815177df125e900056e1e692504435e7610793
+F src/sqliteInt.h 49c7a1223cbe2323a94b1913ed0b0ce946d83278
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1147,7 +1147,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 96397263f94256e284aae9506de1fc48fea89193
-R 38a4e7eb09a43c5c635590012754b8d4
+P df05679838b571c16a7ab7e135f9564cd2d9647c
+R 4daa825d059abf8b202bf30d8a3dabe0
 U drh
-Z dfc0154e1251c61263e69daa57fb4f97
+Z 3cf2241a5e425a53db01dda8b63c0d1d

diff --git a/manifest.uuid b/manifest.uuid
index f8cb2fecf058e0ee4d0e3adb6a02290a5a37f0b9..9f7e8acbd2554b66728e916ec390ce6a2c1ab573 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-df05679838b571c16a7ab7e135f9564cd2d9647c
\ No newline at end of file
+862228e50534a6b89c9498c4db664610db11485e
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index d181d6fa00e8d78d5def5ab74409e15a5f259e9b..fff1bc42e6a843a5ae1c85bfeca7c479968edfdb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1062,8 +1062,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
 ** Return a static string containing the name corresponding to the error code
 ** specified in the argument.
 */
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) || \
-    defined(SQLITE_DEBUG_OS_TRACE)
+#if defined(SQLITE_TEST)
 const char *sqlite3ErrName(int rc){
   const char *zName = 0;
   int i, origRc = rc;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a33ff4d43b770e75525bbddfa45beec48d587dc1..ce366dc480f3a5d8e9c0b97049257a27fe4aeeec 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3138,8 +3138,7 @@ void *sqlite3HexToBlob(sqlite3*, const char *z, int n);
 u8 sqlite3HexToInt(int h);
 int sqlite3TwoPartName(Parse *, Token *, Token *, Token **);
 
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) || \
-    defined(SQLITE_DEBUG_OS_TRACE)
+#if defined(SQLITE_TEST) 
 const char *sqlite3ErrName(int);
 #endif