Change the name of sqlite3_atoi64 back to sqlite3Atoi64 so that it is clearly

and internal API.  Modify the amalgamation to use a macro SQLITE_PRIVATE
instead of the keyword "static" so the macro can be overridden to by nothing. (CVS 4124)

FossilOrigin-Name: 96190cf13dd7219f483308fea92d703328aac4c7

diff --git a/manifest b/manifest
index 6612b70ecfb85163c7dd6684da8d538156dc6aa3..1273e0c050ad73581bc62101c29170b869f05432 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\sstring\sto\sinteger\sconversion\slogic\sto\saddress\stickets\n#2344\sand\s#2454.\s(CVS\s4123)
-D 2007-06-25T17:28:01
+C Change\sthe\sname\sof\ssqlite3_atoi64\sback\sto\ssqlite3Atoi64\sso\sthat\sit\sis\sclearly\nand\sinternal\sAPI.\s\sModify\sthe\samalgamation\sto\suse\sa\smacro\sSQLITE_PRIVATE\ninstead\sof\sthe\skeyword\s"static"\sso\sthe\smacro\scan\sbe\soverridden\sto\sby\snothing.\s(CVS\s4124)
+D 2007-06-26T00:37:28
 F Makefile.in 7f7485a4cc039476a42e534b3f26ec90e2f9753e
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -109,11 +109,11 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 4b0fc3c76a9f23a1c963e01703c0fbbca1b5c34d
 F src/sqlite.h.in 6f290b660b2e7c3359968bb4b344ec31a1178746
 F src/sqlite3ext.h 95575e0d175a0271fe2c3232c0d11e8720ed6887
-F src/sqliteInt.h 475c538baf1105c00ae50c3564dbd20159418f9b
+F src/sqliteInt.h db7e6fafc4c2d02eaebdd1c94aa235f0b5cc1892
 F src/sqliteLimit.h f14609c27636ebc217c9603ade26dbdd7d0f6afa
 F src/table.c a8de75bcedf84d4060d804264b067ab3b1a3561d
 F src/tclsqlite.c 4bffe56752d2c24ade23340e46a91fd92c316e08
-F src/test1.c 9017dab5bfe2b22e9bc8e81ba999a8ae22c61976
+F src/test1.c 0024d7069ecabe0ccc4e2f491e4a43ed5d3f4196
 F src/test2.c 24458b17ab2f3c90cbc1c8446bd7ffe69be62f88
 F src/test3.c a280931fb40222b7c90da45eea926459beee8904
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
@@ -136,16 +136,16 @@ F src/tokenize.c 6cef9e6fc454d789a32c5b509ccb193a2b01977b
 F src/trigger.c 420192efe3e6f03addf7897c60c3c8bf913d3493
 F src/update.c 6b10becb6235ea314ed245fbfbf8b38755e3166e
 F src/utf.c 01b2aba02b10d12903e9e1ff897215c9faf6b662
-F src/util.c f58a68d062608eeed6d8229bb22a61b87e530d68
+F src/util.c 9e81d417fc60bd2fe156f8f2317aa4845bc6cc90
 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
-F src/vdbe.c 251e0121040768fd801920cfecbcb159a891d4af
+F src/vdbe.c 99f53a0aa8db4fe7fa867a24446bdd7deed191c4
 F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
 F src/vdbeInt.h 7d2bf163d6d4e815724a457f2216dd8e38c3955c
 F src/vdbeapi.c 7930b9a188ab385287ca3eb3840af7225cb43549
 F src/vdbeaux.c c580d3605edc2c24ba9bd26fa7aa8b4fff10daa4
 F src/vdbeblob.c 96f3572fdc45eda5be06e6372b612bc30742d9f0
 F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f
-F src/vdbemem.c 327944e70cd807c81705e0d81f9417e89f2c563c
+F src/vdbemem.c ca4d3994507cb0a9504820293af69f5c778b4abd
 F src/vtab.c 51d43cda45d25e6f3a15d19fe32992b7756e74db
 F src/where.c 12387641659605318ae03d87f0687f223dfc9568
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
@@ -446,7 +446,7 @@ F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c fe15d1cbc61c2b0375634b6d8c1ef24520799ea0
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
-F tool/mksqlite3c.tcl 92ed1980d3e35740ed23f2f60d25433b891b5c8b
+F tool/mksqlite3c.tcl 3c062ba144060fdf9ac40f846570311dd75d70bf
 F tool/mksqlite3internalh.tcl 47737a925fb02fce43e2c0a14b3cc17574a4d44a
 F tool/omittest.tcl e6b3d6a1285f9813bc1dea53bb522b4b72774710
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -515,7 +515,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 044ca1c72a8f4632dc2e6a94690d164d3560ee38
-R 31842549475179d1d10a54116c67cbde
+P 5b3a490649ab88c168e3e5bf2efbc7f61b1b954d
+R f6d478d470bd14098b1e348ce99c17b8
 U drh
-Z dd5bcce4a9040dd3c1d7c52ab375cdda
+Z f364c8fcb2e6f1fc93356010ff2b7a3d

diff --git a/manifest.uuid b/manifest.uuid
index 1845cf3fc8ffdc4ec6ce7290b62ab8f572f56534..7644997dd9f610ec74b1d1882a0e655c2dff7915 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5b3a490649ab88c168e3e5bf2efbc7f61b1b954d
\ No newline at end of file
+96190cf13dd7219f483308fea92d703328aac4c7
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 6bdd22ef3da270fcd2f410a8bb1f9ab4bf6aa80b..1f4a3ab3be98ff42ad289eba32408ac2421c33fe 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.576 2007/06/25 17:28:01 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.577 2007/06/26 00:37:28 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1835,7 +1835,7 @@ void sqlite3TableAffinityStr(Vdbe *, Table *);
 char sqlite3CompareAffinity(Expr *pExpr, char aff2);
 int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity);
 char sqlite3ExprAffinity(Expr *pExpr);
-int sqlite3_atoi64(const char*, i64*);
+int sqlite3Atoi64(const char*, i64*);
 void sqlite3Error(sqlite3*, int, const char*,...);
 void *sqlite3HexToBlob(const char *z);
 int sqlite3TwoPartName(Parse *, Token *, Token *, Token **);

diff --git a/src/test1.c b/src/test1.c
index dcb7290f7b3ea00bf2ff557bf708b5ef92277c42..7513c00066f49009825ae1bb9da5b1ecd8ace084 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.257 2007/06/25 17:28:02 drh Exp $
+** $Id: test1.c,v 1.258 2007/06/26 00:37:28 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -1082,7 +1082,7 @@ static int sqlite3_mprintf_int(
 */
 static int sqlite3GetInt64(const char *zNum, i64 *pValue){
   if( sqlite3FitsIn64Bits(zNum) ){
-    sqlite3_atoi64(zNum, pValue);
+    sqlite3Atoi64(zNum, pValue);
     return 1;
   }
   return 0;

diff --git a/src/util.c b/src/util.c
index 13429f998b58914058825e66c6cc1844ad3a0f96..cf222b5d94566e78878a749d977d08b26c706103 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.206 2007/06/25 17:28:02 drh Exp $
+** $Id: util.c,v 1.207 2007/06/26 00:37:28 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -332,7 +332,7 @@ static int compare2pow63(const char *zNum){
 ** 32-bit numbers.  At that time, it was much faster than the
 ** atoi() library routine in RedHat 7.2.
 */
-int sqlite3_atoi64(const char *zNum, i64 *pNum){
+int sqlite3Atoi64(const char *zNum, i64 *pNum){
   i64 v = 0;
   int neg;
   int i, c;
@@ -407,7 +407,7 @@ int sqlite3FitsIn64Bits(const char *zNum){
 ** *pValue to that integer and return true.  Otherwise return false.
 **
 ** Any non-numeric characters that following zNum are ignored.
-** This is different from sqlite3_atoi64() which requires the
+** This is different from sqlite3Atoi64() which requires the
 ** input number to be zero-terminated.
 */
 int sqlite3GetInt32(const char *zNum, int *pValue){

diff --git a/src/vdbe.c b/src/vdbe.c
index 964356ae70574aa37076df2511f7a48749a06a7a..c2c93c52696deee4b2467e66cf363b51b96d00c8 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.631 2007/06/25 17:28:02 drh Exp $
+** $Id: vdbe.c,v 1.632 2007/06/26 00:37:28 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -227,7 +227,7 @@ static void applyNumericAffinity(Mem *pRec){
          && sqlite3IsNumber(pRec->z, &realnum, pRec->enc) ){
       i64 value;
       sqlite3VdbeChangeEncoding(pRec, SQLITE_UTF8);
-      if( !realnum && sqlite3_atoi64(pRec->z, &value) ){
+      if( !realnum && sqlite3Atoi64(pRec->z, &value) ){
         sqlite3VdbeMemRelease(pRec);
         pRec->u.i = value;
         pRec->flags = MEM_Int;

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 3615f3d6911d9d34737cd71743d76349023f8dc1..f05e05cce99bf15d54c5c7010e01be5aa37f09de 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -307,7 +307,7 @@ i64 sqlite3VdbeIntValue(Mem *pMem){
       return 0;
     }
     assert( pMem->z );
-    sqlite3_atoi64(pMem->z, &value);
+    sqlite3Atoi64(pMem->z, &value);
     return value;
   }else{
     return 0;

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index df93daf509ef3f8c2dd642d31ae1366e1ba027d5..0387d8137ee8fb8d2480c0d5fb28d88941dd60bb 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -70,6 +70,12 @@ puts $out [subst \
 ** This amalgamation was generated on $today.
 */
 #define SQLITE_AMALGAMATION 1}]
+if {$addstatic} {
+  puts $out \
+{#ifndef SQLITE_PRIVATE
+# define SQLITE_PRIVATE static
+#endif}
+}
 
 # These are the header files used by SQLite.  The first time any of these 
 # files are seen in a #include statement in the C code, include the complete
@@ -148,7 +154,7 @@ proc copy_file {filename} {
     } elseif {$addstatic && [regexp $declpattern $line] 
                   && ![regexp {^static} $line]} {
       # Add the "static" keyword before internal functions.
-      puts $out "static $line"
+      puts $out "SQLITE_PRIVATE $line"
     } else {
       puts $out $line
     }