Fix for Win32: The %p format on Win32 does not prepend a "0x" as it should. (CVS...

FossilOrigin-Name: ee86704daf184307fe98b5631f22ceb3d701afce

diff --git a/manifest b/manifest
index 6b196d7507e926c126502c77f7bcb6ff7a1e2000..c649948ffc9b4c58158e40f4921ae8b230b24ec5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\srollback\sproblems:\s\sFix\stwo\smore\serrors\sintroduced\sby\schecking\s(410)\sthat\ncan\scause\sdatabase\scorruption\safter\sa\sROLLBACK.\s\sAlso\sadd\snew\stests\sto\smake\nsure\severything\sis\sworking\sthis\stime.\s(CVS\s663)
-D 2002-07-07T16:52:47
+C Fix\sfor\sWin32:\sThe\s%p\sformat\son\sWin32\sdoes\snot\sprepend\sa\s"0x"\sas\sit\sshould.\s(CVS\s665)
+D 2002-07-07T17:12:36
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -43,10 +43,10 @@ F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in 75c5bbb066d0faf34424b7d1babf8b44d5b31af2
 F src/sqliteInt.h 6a36f4fc32cbbf3e6bf15516137b113b3dc973aa
 F src/table.c eed2098c9b577aa17f8abe89313a9c4413f57d63
-F src/tclsqlite.c 84bb86f3aa7640231e30356b11c2218a4e1c42f9
+F src/tclsqlite.c 8a6a8cf06f9d3107f06d04996fda39483cd25d87
 F src/test1.c a2f2b6b1df07d4e8b380323896c3ed34442cea91
 F src/test2.c 669cc22781c6461a273416ec1a7414d25c081730
-F src/test3.c c0adb37b0370958df273d36051546b4c843a5bc6
+F src/test3.c fda085b4cdd5a2d7f65786ce679036e955f4bfa2
 F src/threadtest.c 81f0598e0f031c1bd506af337fdc1b7e8dff263f
 F src/tokenize.c b5500e193a82b5b9888fbf947efd90d3b4858178
 F src/trigger.c d88ab4d68d68955c217b38fb6717e090fbbf54a4
@@ -140,7 +140,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 6284c65c174bb2cd049fd1db81de52be3abf4000
-R 66486ccd900763207e459fadea926940
+P f6e24d5ccbcfcf5863ffbd65860dafa2f5663e99
+R 40fe3b9213d364dad4e1cb9b6ce3c5e4
 U drh
-Z 6cbbb10ace5dd6c600cdbe2673a30799
+Z 1168f727460fe73d4f7ce771c0771951

diff --git a/manifest.uuid b/manifest.uuid
index 84d0cc7fc87715b00c9b5da6c4b3398b7e8964b9..3a2a78e590ffe4a66bf435acdea911e662fa5327 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6e24d5ccbcfcf5863ffbd65860dafa2f5663e99
\ No newline at end of file
+ee86704daf184307fe98b5631f22ceb3d701afce
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 652b2cd2eee061db13c1b77114d27c1b99b44814..fecc6ab58c54ba58bfe4abac900a611e20ab5b29 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.35 2002/07/06 16:32:15 drh Exp $
+** $Id: tclsqlite.c,v 1.36 2002/07/07 17:12:36 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -587,6 +587,9 @@ static int DbMain(void *cd, Tcl_Interp *interp, int argc, char **argv){
   /* The return value is the value of the sqlite* pointer
   */
   sprintf(zBuf, "%p", p->db);
+  if( strncmp(zBuf,"0x",2) ){
+    sprintf(zBuf, "0x%p", p->db);
+  }
   Tcl_AppendResult(interp, zBuf, 0);
 
   /* If compiled with SQLITE_TEST turned on, then register the "md5sum"

diff --git a/src/test3.c b/src/test3.c
index c8bb40d5cd954a5ad775e70eb91f23006f3ee4cc..ff447078bdedec267c8530492665c46e8dba3927 100644 (file)
--- a/src/test3.c
+++ b/src/test3.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test3.c,v 1.16 2002/07/06 16:32:15 drh Exp $
+** $Id: test3.c,v 1.17 2002/07/07 17:12:36 drh Exp $
 */
 #include "sqliteInt.h"
 #include "pager.h"
@@ -73,6 +73,9 @@ static int btree_open(
     return TCL_ERROR;
   }
   sprintf(zBuf,"%p", pBt);
+  if( strncmp(zBuf,"0x",2) ){
+    sprintf(zBuf, "0x%p", pBt);
+  }
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
 }