From: drh <drh@noemail.net>
Date: Wed, 23 Jul 2014 14:52:05 +0000 (+0000)
Subject: Remove a surplus function prototype.  #ifdef code that is not used when
X-Git-Tag: version-3.8.6~64^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b7ddc59158b4676e4382a5b39a0b40697c5f91d;p=thirdparty%2Fsqlite.git

Remove a surplus function prototype.  #ifdef code that is not used when
hex integers are omitted at compile time.

FossilOrigin-Name: a5b383e077e4b277a65920f7cc202f32f07aa9ee
---

diff --git a/manifest b/manifest
index 8a6aa1f099..70612a16ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\shex\sliteral\sprocessing\sso\sthat\sonly\sthe\sSQL\sparser\sunderstands\nhex\sliterals.\s\sCasting\sand\scoercing\sstring\sliterals\sinto\snumeric\svalues\sdoes\nnot\sunderstand\shexadecimal\sintegers.\s\sThis\spreserves\sbackwards\scompatibility.\nAlso:\s\sThrow\san\serror\son\sany\shex\sliteral\sthat\sis\stoo\sbig\sto\sfit\sinto\s64\sbits.
-D 2014-07-23T13:40:49.410
+C Remove\sa\ssurplus\sfunction\sprototype.\s\s#ifdef\scode\sthat\sis\snot\sused\swhen\nhex\sintegers\sare\somitted\sat\scompile\stime.
+D 2014-07-23T14:52:05.196
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
 F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
-F src/expr.c b1ffac76b69ae005ca38eba6dcdefa5d65eb5c95
+F src/expr.c b989d07fc7c8780fff77365a4fc59881223e340c
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
 F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
@@ -227,7 +227,7 @@ F src/shell.c 566aee8213372a2e81ba0eb34e9759f7b2574009
 F src/sqlite.h.in fd8e3a36b0aded082dc93a4b89c1e85324b4cf75
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h 783e77ab498ac05a3fab396dfc1c2d6c2083dced
+F src/sqliteInt.h e8ff8fdb515774d330af4a4800e032ed00cc9adb
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1184,7 +1184,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 4b86ccdf4f4eb4339a5706e10ad24f01b6c3939e
-R a36ec645688e0ae2f526ebda77270f17
+P 6c6f0de59bf96b79c8ace8c9bfe48c7a6a306a50
+R 9da9b225ebea231badb4246df3d3d1b3
 U drh
-Z 32ccd1ec50cb642ea84793b61793e5b3
+Z 6e030ade89af7e36cbcb367d7755ee7b
diff --git a/manifest.uuid b/manifest.uuid
index f47a66e629..af55c0e7ef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c6f0de59bf96b79c8ace8c9bfe48c7a6a306a50
\ No newline at end of file
+a5b383e077e4b277a65920f7cc202f32f07aa9ee
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index a60c0cba43..72286dfdf9 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2085,9 +2085,12 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
 #ifdef SQLITE_OMIT_FLOATING_POINT
       sqlite3ErrorMsg(pParse, "oversized integer: %s%s", negFlag ? "-" : "", z);
 #else
+#ifndef SQLITE_OMIT_HEX_INTEGER
       if( sqlite3_strnicmp(z,"0x",2)==0 ){
         sqlite3ErrorMsg(pParse, "hex literal too big: %s", z);
-      }else{
+      }else
+#endif
+      {
         codeReal(v, z, negFlag, iMem);
       }
 #endif
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0bbf9945ce..ca075307eb 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3335,7 +3335,6 @@ int sqlite3DecOrHexToI64(const char*, i64*);
 void sqlite3Error(sqlite3*, int, const char*,...);
 void *sqlite3HexToBlob(sqlite3*, const char *z, int n);
 u8 sqlite3HexToInt(int h);
-int sqlite3HexToI64(const char*,i64*);
 int sqlite3TwoPartName(Parse *, Token *, Token *, Token **);
 
 #if defined(SQLITE_TEST)