Add makefile targets for various diagnostic tools, such as showstat4.

Fix harmless compiler warnings in diagnostic tools.

FossilOrigin-Name: 6f86d89b8800c50035da7809bff941d08a33a6a2

diff --git a/Makefile.in b/Makefile.in
index 72f7cfc007df494f7a7be2fe33bcae8285ff6bf2..b5768e83a68dabdc793bd5a515c8984b8789b6d6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -939,8 +939,20 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TO
 sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
        $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
 
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.c
-       $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.c $(TLIBS)
+showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
+       $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
+
+showstat4$(TEXE):      $(TOP)/tool/showstat4.c sqlite3.lo
+       $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
+
+showjournal$(TEXE):    $(TOP)/tool/showjournal.c sqlite3.lo
+       $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
+
+showwal$(TEXE):        $(TOP)/tool/showwal.c sqlite3.lo
+       $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
+
+rollback-test$(TEXE):  $(TOP)/tool/rollback-test.c sqlite3.lo
+       $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
 
 LogEst$(TEXE): $(TOP)/tool/logest.c sqlite3.h
        $(LTLINK) -I. -o $@ $(TOP)/tool/logest.c

diff --git a/Makefile.msc b/Makefile.msc
index 409f7b3d282d525b174a673fed533ce88efe35cc..55d26e3053b2bf6af9ff1d918306e46d52e09351 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1435,6 +1435,22 @@ showdb.exe:      $(TOP)\tool\showdb.c $(SQLITE3C)
        $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\tool\showdb.c $(SQLITE3C)
 
+showstat4.exe: $(TOP)\tool\showstat4.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\tool\showstat4.c $(SQLITE3C)
+
+showjournal.exe:       $(TOP)\tool\showjournal.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\tool\showjournal.c $(SQLITE3C)
+
+showwal.exe:   $(TOP)\tool\showwal.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\tool\showwal.c $(SQLITE3C)
+
+rollback-test.exe:     $(TOP)\tool\rollback-test.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\tool\rollback-test.c $(SQLITE3C)
+
 LogEst.exe:    $(TOP)\tool\logest.c sqlite3.h
        $(LTLINK) -Fe$@ $(TOP)\tool\LogEst.c
 

diff --git a/main.mk b/main.mk
index 30149eccab2f68152d9005726c07ae639fc0e216..62b6b22475b5d20028388f5ec1d81f56b73dbc62 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -628,9 +628,25 @@ $(TEST_EXTENSION): $(TOP)/src/test_loadext.c
 extensiontest: testfixture$(EXE) $(TEST_EXTENSION)
        ./testfixture$(EXE) $(TOP)/test/loadext.test
 
-showdb$(EXE):  $(TOP)/tool/showdb.c sqlite3.c
+showdb$(EXE):  $(TOP)/tool/showdb.c sqlite3.o
        $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o showdb$(EXE) \
-               $(TOP)/tool/showdb.c sqlite3.c
+               $(TOP)/tool/showdb.c sqlite3.o $(THREADLIB)
+
+showstat4$(EXE):       $(TOP)/tool/showstat4.c sqlite3.o
+       $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o showstat4$(EXE) \
+               $(TOP)/tool/showstat4.c sqlite3.o $(THREADLIB)
+
+showjournal$(EXE):     $(TOP)/tool/showjournal.c sqlite3.o
+       $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o showjournal$(EXE) \
+               $(TOP)/tool/showjournal.c sqlite3.o $(THREADLIB)
+
+showwal$(EXE): $(TOP)/tool/showwal.c sqlite3.o
+       $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o showwal$(EXE) \
+               $(TOP)/tool/showwal.c sqlite3.o $(THREADLIB)
+
+rollback-test$(EXE):   $(TOP)/tool/rollback-test.c sqlite3.o
+       $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o rollback-test$(EXE) \
+               $(TOP)/tool/rollback-test.c sqlite3.o $(THREADLIB)
 
 LogEst$(EXE):  $(TOP)/tool/logest.c sqlite3.h
        $(TCC) -o LogEst$(EXE) $(TOP)/tool/logest.c

diff --git a/manifest b/manifest
index 27807f1cbc5070bfdcaaa83729d7a3ef21e8daa9..5cda3a858e6374d9add16d39c03d206c2d57104f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\ssome\smore\sIN\soperator\stests.
-D 2014-06-26T22:17:21.764
+C Add\smakefile\stargets\sfor\svarious\sdiagnostic\stools,\ssuch\sas\sshowstat4.\nFix\sharmless\scompiler\swarnings\sin\sdiagnostic\stools.
+D 2014-06-30T11:14:26.241
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
+F Makefile.in 1732320ecac3fee229d560d7ef2afa34681d1815
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc b2d3ac211b479fa5a6c9aaf3b9c49fdea900d228
+F Makefile.msc ad60c4d8be35f98fdcca614088b84a91612b2b4c
 F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
 F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@ -146,7 +146,7 @@ F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 7b1d0be0840f213405c977c87917241158126a33
+F main.mk 7850d834ca7f3c772e2b0087631868d5bfdeabb9
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -1159,8 +1159,8 @@ F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
-F tool/showdb.c b018a8a69d07050fc0fe9afcf17313cdef0cc599
-F tool/showjournal.c b62cecaab86a4053d944c276bb5232e4d17ece02
+F tool/showdb.c 213e0288501b2cf67c1b2c72a9e5b8acda4738b3
+F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5
 F tool/showstat4.c c39279d6bd37cb999b634f0064f6f86ad7af008f
 F tool/showwal.c 3f7f7da5ec0cba51b1449a75f700493377da57b5
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
@@ -1181,7 +1181,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 92f7ad43dbfe4e02490df2f932c3c74fb89064d6
-R 61cea95999002249f7da20d93ec0602d
-U mistachkin
-Z 2021f223ccdab7be5b0b3bf69eadf881
+P fb32e374b75b160e7b535e732ced6c34dbb513eb
+R 46fc4bdeeae8d59d2e02be8ec2b2e5ac
+U drh
+Z cf9f7f35abbae67619fbb464751389eb

diff --git a/manifest.uuid b/manifest.uuid
index 9daab53ded70bc9ecf1ccce7fc48d042d5b960c1..2b01869e5656248a51b32a2556c9fb814cc7343c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fb32e374b75b160e7b535e732ced6c34dbb513eb
\ No newline at end of file
+6f86d89b8800c50035da7809bff941d08a33a6a2
\ No newline at end of file

diff --git a/tool/showdb.c b/tool/showdb.c
index bf4af444b2e545caa1f87c55406ab1953318a929..8dd387365cc217e8d7f6bbee31090b7828cb9f4f 100644 (file)
--- a/tool/showdb.c
+++ b/tool/showdb.c
@@ -66,7 +66,7 @@ static unsigned char *getContent(int ofst, int nByte){
   if( aData==0 ) out_of_memory();
   memset(aData, 0, nByte+32);
   lseek(db, ofst, SEEK_SET);
-  read(db, aData, nByte);
+  if( read(db, aData, nByte)<nByte ) memset(aData, 0, nByte);
   return aData;
 }
 
@@ -973,7 +973,7 @@ int main(int argc, char **argv){
   zPgSz[0] = 0;
   zPgSz[1] = 0;
   lseek(db, 16, SEEK_SET);
-  read(db, zPgSz, 2);
+  if( read(db, zPgSz, 2)<2 ) memset(zPgSz, 0, 2);
   pagesize = zPgSz[0]*256 + zPgSz[1]*65536;
   if( pagesize==0 ) pagesize = 1024;
   printf("Pagesize: %d\n", pagesize);

diff --git a/tool/showjournal.c b/tool/showjournal.c
index 5724f52974bdbc3e11c71d7ec03fcda538783937..19220f5196af37b939c4c92f40574f28aa162f70 100644 (file)
--- a/tool/showjournal.c
+++ b/tool/showjournal.c
@@ -12,7 +12,6 @@
 static int pageSize = 1024;
 static int sectorSize = 512;
 static FILE *db = 0;
-static int showPageContent = 0;
 static int fileSize = 0;
 static unsigned cksumNonce = 0;
 
@@ -26,9 +25,9 @@ static void out_of_memory(void){
 ** Read N bytes of memory starting at iOfst into space obtained
 ** from malloc().
 */
-static char *read_content(int N, int iOfst){
+static unsigned char *read_content(int N, int iOfst){
   int got;
-  char *pBuf = malloc(N);
+  unsigned char *pBuf = malloc(N);
   if( pBuf==0 ) out_of_memory();
   fseek(db, iOfst, SEEK_SET);
   got = fread(pBuf, 1, N, db);
@@ -46,14 +45,14 @@ static char *read_content(int N, int iOfst){
 /* Print a line of decode output showing a 4-byte integer.
 */
 static unsigned print_decode_line(
-  unsigned char *aData,      /* Content being decoded */
-  int ofst, int nByte,       /* Start and size of decode */
-  const char *zMsg           /* Message to append */
+  const unsigned char *aData,  /* Content being decoded */
+  int ofst, int nByte,         /* Start and size of decode */
+  const char *zMsg             /* Message to append */
 ){
   int i, j;
   unsigned val = aData[ofst];
   char zBuf[100];
-  sprintf(zBuf, " %03x: %02x", ofst, aData[ofst]);
+  sprintf(zBuf, " %05x: %02x", ofst, aData[ofst]);
   i = strlen(zBuf);
   for(j=1; j<4; j++){
     if( j>=nByte ){
@@ -74,7 +73,7 @@ static unsigned print_decode_line(
 ** in global variables.
 */
 static unsigned decode_journal_header(int iOfst){
-  char *pHdr = read_content(64, iOfst);
+  unsigned char *pHdr = read_content(64, iOfst);
   unsigned nPage;
   printf("Header at offset %d:\n", iOfst);
   print_decode_line(pHdr, 0, 4, "Header part 1 (3654616569)");
@@ -101,12 +100,11 @@ static void print_page(int iOfst){
   char zTitle[50];
   aData = read_content(pageSize+8, iOfst);
   sprintf(zTitle, "page number for page at offset %d", iOfst);
-  print_decode_line(aData, 0, 4, zTitle);
+  print_decode_line(aData-iOfst, iOfst, 4, zTitle);
   free(aData);
 }
 
 int main(int argc, char **argv){
-  int rc;
   int nPage, cnt;
   int iOfst;
   if( argc!=2 ){
@@ -136,4 +134,5 @@ int main(int argc, char **argv){
     iOfst = (iOfst/sectorSize + 1)*sectorSize;
   }
   fclose(db);
+  return 0;
 }