Fix a compiler warning in date.c. Update makefiles to include all necessary

dependencies for building shell.c.

FossilOrigin-Name: 178b7d46f9c8e1694ed6f506d2785a9f5c49e2b428e04c8096d557cc1b5c9680

diff --git a/Makefile.in b/Makefile.in
index e858e55c344b239f2c258db938c0c23618d0a6fb..321fb7527864152cbc3e0a5a4670f6bce32d1997 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1156,35 +1156,37 @@ keywordhash.h:  $(TOP)/tool/mkkeywordhash.c
        $(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
        ./mkkeywordhash$(BEXE) >keywordhash.h
 
-# Source files that go into making shell.c
-SHELL_SRC = \
-       $(TOP)/src/shell.c.in \
-       $(TOP)/ext/consio/console_io.c \
-       $(TOP)/ext/consio/console_io.h \
-       $(TOP)/ext/misc/appendvfs.c \
-       $(TOP)/ext/misc/completion.c \
-       $(TOP)/ext/misc/decimal.c \
-       $(TOP)/ext/misc/basexx.c \
-       $(TOP)/ext/misc/base64.c \
-       $(TOP)/ext/misc/base85.c \
-       $(TOP)/ext/misc/fileio.c \
-       $(TOP)/ext/misc/ieee754.c \
-       $(TOP)/ext/misc/regexp.c \
-       $(TOP)/ext/misc/series.c \
-       $(TOP)/ext/misc/shathree.c \
-       $(TOP)/ext/misc/sqlar.c \
-       $(TOP)/ext/misc/uint.c \
-       $(TOP)/ext/expert/sqlite3expert.c \
-       $(TOP)/ext/expert/sqlite3expert.h \
-       $(TOP)/ext/misc/zipfile.c \
-       $(TOP)/ext/misc/memtrace.c \
-       $(TOP)/ext/misc/pcachetrace.c \
-       $(TOP)/ext/recover/dbdata.c \
-       $(TOP)/ext/recover/sqlite3recover.c \
-       $(TOP)/ext/recover/sqlite3recover.h \
-       $(TOP)/src/test_windirent.c
-
-shell.c:       $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl has_tclsh84
+# Source and header files that shell.c depends on
+SHELL_DEP = \
+    $(TOP)/src/shell.c.in \
+    $(TOP)/ext/consio/console_io.c \
+    $(TOP)/ext/consio/console_io.h \
+    $(TOP)/ext/expert/sqlite3expert.c \
+    $(TOP)/ext/expert/sqlite3expert.h \
+    $(TOP)/ext/intck/sqlite3intck.c \
+    $(TOP)/ext/intck/sqlite3intck.h \
+    $(TOP)/ext/misc/appendvfs.c \
+    $(TOP)/ext/misc/base64.c \
+    $(TOP)/ext/misc/base85.c \
+    $(TOP)/ext/misc/completion.c \
+    $(TOP)/ext/misc/decimal.c \
+    $(TOP)/ext/misc/fileio.c \
+    $(TOP)/ext/misc/ieee754.c \
+    $(TOP)/ext/misc/memtrace.c \
+    $(TOP)/ext/misc/pcachetrace.c \
+    $(TOP)/ext/misc/regexp.c \
+    $(TOP)/ext/misc/series.c \
+    $(TOP)/ext/misc/shathree.c \
+    $(TOP)/ext/misc/sqlar.c \
+    $(TOP)/ext/misc/uint.c \
+    $(TOP)/ext/misc/zipfile.c \
+    $(TOP)/ext/recover/dbdata.c \
+    $(TOP)/ext/recover/sqlite3recover.c \
+    $(TOP)/ext/recover/sqlite3recover.h \
+    $(TOP)/src/test_windirent.c \
+    $(TOP)/src/test_windirent.h
+
+shell.c:       $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl has_tclsh84
        $(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c
 
 

diff --git a/Makefile.msc b/Makefile.msc
index d0875c92e10cd44b9da0d3a9c54321710774d767..2f67600c31397be8ea654fac94708ea106ea7adf 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2272,39 +2272,44 @@ mkkeywordhash.exe:      $(TOP)\tool\mkkeywordhash.c
 keywordhash.h: $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
        .\mkkeywordhash.exe > keywordhash.h
 
-# Source files that go into making shell.c
-SHELL_SRC = \
-       $(TOP)\src\shell.c.in \
-       $(TOP)\ext\consio\console_io.c \
-       $(TOP)\ext\consio\console_io.h \
-       $(TOP)\ext\misc\appendvfs.c \
-       $(TOP)\ext\misc\completion.c \
-       $(TOP)\ext\misc\base64.c \
-       $(TOP)\ext\misc\base85.c \
-       $(TOP)\ext\misc\decimal.c \
-       $(TOP)\ext\misc\fileio.c \
-       $(TOP)\ext\misc\ieee754.c \
-       $(TOP)\ext\misc\regexp.c \
-       $(TOP)\ext\misc\series.c \
-       $(TOP)\ext\misc\shathree.c \
-       $(TOP)\ext\misc\uint.c \
-       $(TOP)\ext\expert\sqlite3expert.c \
-       $(TOP)\ext\expert\sqlite3expert.h \
-       $(TOP)\ext\misc\memtrace.c \
-       $(TOP)\ext\misc\pcachetrace.c \
-       $(TOP)\ext\recover\dbdata.c \
-       $(TOP)\ext\recover\sqlite3recover.c \
-       $(TOP)\ext\recover\sqlite3recover.h \
-       $(TOP)\src\test_windirent.c
+# Source and header files that shell.c depends on
+SHELL_DEP = \
+    $(TOP)\src\shell.c.in \
+    $(TOP)\ext\consio\console_io.c \
+    $(TOP)\ext\consio\console_io.h \
+    $(TOP)\ext\expert\sqlite3expert.c \
+    $(TOP)\ext\expert\sqlite3expert.h \
+    $(TOP)\ext\intck\sqlite3intck.c \
+    $(TOP)\ext\intck\sqlite3intck.h \
+    $(TOP)\ext\misc\appendvfs.c \
+    $(TOP)\ext\misc\base64.c \
+    $(TOP)\ext\misc\base85.c \
+    $(TOP)\ext\misc\completion.c \
+    $(TOP)\ext\misc\decimal.c \
+    $(TOP)\ext\misc\fileio.c \
+    $(TOP)\ext\misc\ieee754.c \
+    $(TOP)\ext\misc\memtrace.c \
+    $(TOP)\ext\misc\pcachetrace.c \
+    $(TOP)\ext\misc\regexp.c \
+    $(TOP)\ext\misc\series.c \
+    $(TOP)\ext\misc\shathree.c \
+    $(TOP)\ext\misc\sqlar.c \
+    $(TOP)\ext\misc\uint.c \
+    $(TOP)\ext\misc\zipfile.c \
+    $(TOP)\ext\recover\dbdata.c \
+    $(TOP)\ext\recover\sqlite3recover.c \
+    $(TOP)\ext\recover\sqlite3recover.h \
+    $(TOP)\src\test_windirent.c \
+    $(TOP)\src\test_windirent.h
 
 # If use of zlib is enabled, add the "zipfile.c" source file.
 #
 !IF $(USE_ZLIB)!=0
-SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\sqlar.c
-SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
+SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\sqlar.c
+SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\zipfile.c
 !ENDIF
 
-shell.c:       $(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
+shell.c:       $(SHELL_DEP) $(TOP)\tool\mkshellc.tcl
        $(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
 
 zlib:

diff --git a/main.mk b/main.mk
index be485b69ed532b3690be4b169d7c21beb0d04406..139e182eb1aaf9493f366f33b25de7fb4c7ebbe0 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -718,8 +718,7 @@ opcodes.c:  opcodes.h $(TOP)/tool/mkopcodec.tcl
        tclsh $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c
 
 opcodes.h:     parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl
-       cat parse.h $(TOP)/src/vdbe.c | \
-               tclsh $(TOP)/tool/mkopcodeh.tcl >opcodes.h
+       cat parse.h $(TOP)/src/vdbe.c | tclsh $(TOP)/tool/mkopcodeh.tcl >opcodes.h
 
 # Rules to build parse.c and parse.h - the outputs of lemon.
 #
@@ -742,32 +741,37 @@ keywordhash.h:    $(TOP)/tool/mkkeywordhash.c
        $(BCC) -o mkkeywordhash $(OPTS) $(TOP)/tool/mkkeywordhash.c
        ./mkkeywordhash >keywordhash.h
 
-# Source files that go into making shell.c
-SHELL_SRC = \
-       $(TOP)/src/shell.c.in \
-        $(TOP)/ext/misc/appendvfs.c \
-       $(TOP)/ext/misc/completion.c \
-        $(TOP)/ext/misc/base64.c \
-        $(TOP)/ext/misc/base85.c \
-        $(TOP)/ext/misc/decimal.c \
-       $(TOP)/ext/misc/fileio.c \
-        $(TOP)/ext/misc/ieee754.c \
-        $(TOP)/ext/misc/regexp.c \
-        $(TOP)/ext/misc/series.c \
-       $(TOP)/ext/misc/shathree.c \
-       $(TOP)/ext/misc/sqlar.c \
-        $(TOP)/ext/misc/uint.c \
-       $(TOP)/ext/expert/sqlite3expert.c \
-       $(TOP)/ext/expert/sqlite3expert.h \
-       $(TOP)/ext/misc/zipfile.c \
-       $(TOP)/ext/misc/memtrace.c \
-       $(TOP)/ext/misc/pcachetrace.c \
-       $(TOP)/ext/recover/dbdata.c \
-       $(TOP)/ext/recover/sqlite3recover.c \
-       $(TOP)/ext/recover/sqlite3recover.h \
-        $(TOP)/src/test_windirent.c
-
-shell.c:       $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
+# Source and header files that shell.c depends on
+SHELL_DEP = \
+    $(TOP)/src/shell.c.in \
+    $(TOP)/ext/consio/console_io.c \
+    $(TOP)/ext/consio/console_io.h \
+    $(TOP)/ext/expert/sqlite3expert.c \
+    $(TOP)/ext/expert/sqlite3expert.h \
+    $(TOP)/ext/intck/sqlite3intck.c \
+    $(TOP)/ext/intck/sqlite3intck.h \
+    $(TOP)/ext/misc/appendvfs.c \
+    $(TOP)/ext/misc/base64.c \
+    $(TOP)/ext/misc/base85.c \
+    $(TOP)/ext/misc/completion.c \
+    $(TOP)/ext/misc/decimal.c \
+    $(TOP)/ext/misc/fileio.c \
+    $(TOP)/ext/misc/ieee754.c \
+    $(TOP)/ext/misc/memtrace.c \
+    $(TOP)/ext/misc/pcachetrace.c \
+    $(TOP)/ext/misc/regexp.c \
+    $(TOP)/ext/misc/series.c \
+    $(TOP)/ext/misc/shathree.c \
+    $(TOP)/ext/misc/sqlar.c \
+    $(TOP)/ext/misc/uint.c \
+    $(TOP)/ext/misc/zipfile.c \
+    $(TOP)/ext/recover/dbdata.c \
+    $(TOP)/ext/recover/sqlite3recover.c \
+    $(TOP)/ext/recover/sqlite3recover.h \
+    $(TOP)/src/test_windirent.c \
+    $(TOP)/src/test_windirent.h
+
+shell.c:       $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl
        tclsh $(TOP)/tool/mkshellc.tcl >shell.c
 
 

diff --git a/manifest b/manifest
index 9a3eabe50d76d2a7247d28e3947fc72ac96a102c..47ed7609bb7255c07724cc63f76d42e1bcd07e8b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Change\stest\sresults\sin\scorruptC.test\sto\saccount\sfor\sthe\sadded\sdetail\sin\sthe\noutput\sof\s"PRAGMA\sintegrity_check"\sfrom\s[b736519d3d2e93c7].
-D 2024-03-04T16:44:37.718
+C Fix\sa\scompiler\swarning\sin\sdate.c.\s\sUpdate\smakefiles\sto\sinclude\sall\snecessary\ndependencies\sfor\sbuilding\sshell.c.
+D 2024-03-04T18:22:18.359
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 3c4f4879b2301e5486939f68cc64f84430861d246ac11430ff1a1d7347ed5b8c
+F Makefile.in ca8b906b1c3285fc32cff9978a5b827f99ae3d440077babf32c257a92a2ba11c
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 15a875f6016c4200e7093db92365fabb8b32eb09f9e40e1aadeedeecad4050d5
+F Makefile.msc 72c8436ee7528cb78f7318230548aab145ef05d15a8feed0f3cb251a26384403
 F README.md 6358805260a03ebead84e168bbf3740ddf3f683b477e478567186aa7afb490d3
 F VERSION c84541c6a9e8426462176fbb1f9ecb5cfd7d1bb56228053ff7eeba8841673eb6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -670,7 +670,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 2c8b556ba7a4a15f5440663f7b05da221355d1921d5c75298bb50e2bb8081d79
+F main.mk e5da4b6c13f2b15bba7f1efb0a47089dfdde0973e85a024785485655d59fd758
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -696,7 +696,7 @@ F src/build.c 04f1bcee189f045ab086d84fee95db42cb49df82ff8e84af8136309ff3c8a75f
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
-F src/date.c a9e4382961fb26156a308645f7363519ab7eb20e412e78b7c1fe16bbfbb1689a
+F src/date.c 126ba2ab10aeb2e7ba6e089b5f07b747c0625b8287f78b60da346eda8d23c875
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
@@ -2176,8 +2176,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 596668e6625208ff5d2ffbb4e0530530ebb3a400efa0df54bad1d91953e32694
-R e247d8c69a2f1de22f60330dc6b8c1d7
+P 0d19eeaafb296aad212ee4f55a0f6df8c7c5185b14d7f7f49c020fe4cbe370c1
+R 191956f8db663f29da20ebca61821faf
 U drh
-Z c67139450867debeac7f30d4414de41e
+Z 23a2cbc5a581c90c55252c83bc05fa14
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 063d7c49a5ba13effd58d3dd8859c1b1741328de..4c6664f16039e7bb0ed1978be5a8833987ea9ec7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d19eeaafb296aad212ee4f55a0f6df8c7c5185b14d7f7f49c020fe4cbe370c1
\ No newline at end of file
+178b7d46f9c8e1694ed6f506d2785a9f5c49e2b428e04c8096d557cc1b5c9680
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index 3bb4a8c714bf073dadaa55f3ccb0479621a5dd94..d74cecb1d9a7d7c2ed614d420f8bcb6e8db30712 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -356,7 +356,7 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
     computeJD(p);
   }
   return 0;
-};
+}
 
 
 static void clearYMD_HMS_TZ(DateTime *p);  /* Forward declaration */