]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Port sqlite3_analyzer.exe to use sqlite3_stdio.
authordrh <>
Tue, 24 Sep 2024 17:49:06 +0000 (17:49 +0000)
committerdrh <>
Tue, 24 Sep 2024 17:49:06 +0000 (17:49 +0000)
FossilOrigin-Name: 7c1c1226d803dbaf8e75085b1cc2aad88aef4c3168288e587c8c736633d09054

Makefile.msc
ext/misc/sqlite3_stdio.c
manifest
manifest.uuid
tool/sqlite3_analyzer.c.in

index cc0285bb2c5d8db2316d0edf6633a057cb14fb7b..60669993c1e9b0159d2e6fe6a6800547a46873f8 100644 (file)
@@ -2624,7 +2624,7 @@ smoketest:        $(TESTPROGS)
 shelltest: $(TESTPROGS)
        .\testfixture.exe $(TOP)\test\permutations.test shell
 
-sqlite3_analyzer.c:    $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in $(TOP)\ext\consio\console_io.h $(TOP)\ext\consio\console_io.c $(SQLITE_TCL_DEP)
+sqlite3_analyzer.c:    $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in $(TOP)\ext\misc\sqlite3_stdio.h $(TOP)\ext\misc\sqlite3_stdio.c $(SQLITE_TCL_DEP)
        $(TCLSH_CMD) $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in > $@
 
 sqlite3_analyzer.exe:  sqlite3_analyzer.c $(LIBRESOBJS)
index 6b7beff4e681cc6650d460f9bee190c181944845..5447faadf768933a4488b51b522f13b3a046b688 100644 (file)
@@ -14,7 +14,9 @@
 ** on Windows.
 */
 #ifdef _WIN32  /* This file is a no-op on all platforms except Windows */
+#ifndef _SQLITE3_STDIO_H_
 #include "sqlite3_stdio.h"
+#endif
 #undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
index 728db2c94ec0aea4d4e5554614682a8b7e79fe59..4679c11a96128f676b90006b05c78e74071ccd36 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Port\ssqldiff\sover\sto\suse\ssqlite3_stdio.
-D 2024-09-24T17:40:54.086
+C Port\ssqlite3_analyzer.exe\sto\suse\ssqlite3_stdio.
+D 2024-09-24T17:49:06.245
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 6a826facc78c3c8ad38bf00ed588f6aa3665ccd7a9749b891d20582fc290c77e
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 10fcf3b1eff1859846878469ffad1ebcd168fa0bd9e8a81f76ce65465b79e35d
+F Makefile.msc 9c6d80d9d103fa42e931f4c464884a5e577fae8563acc7589bff4e43fbe8f864
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -425,7 +425,7 @@ F ext/misc/shathree.c 1821d90a0040c9accdbe3e3527d378d30569475d758aa70f6848924c0b
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c c0aa7b80d6df45f7da59d912b38752bcac1af53a5766966160e6c5cdd397dbea
 F ext/misc/sqlar.c a6175790482328171da47095f87608b48a476d4fac78d8a9ff18b03a2454f634
-F ext/misc/sqlite3_stdio.c d9c7b3883788ef6e15134323783d6a3c69d2b453545a2aa60d8a3503bfeadcb7
+F ext/misc/sqlite3_stdio.c aefcfaeefdee26eae2c0d94e41d3720d86b1dc5c96e70132366ab1e204f9ef92
 F ext/misc/sqlite3_stdio.h f05eaf5e0258f0573910324a789a9586fc360a57678c57a6d63cfaa2245b6176
 F ext/misc/stmt.c b090086cd6bd6281c21271d38d576eeffe662f0e6b67536352ce32bbaa438321
 F ext/misc/stmtrand.c 59cffa5d8e158943ff1ce078956d8e208e8c04e67307e8f249dece2436dcb7fc
@@ -2177,7 +2177,7 @@ F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d
 F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
 F tool/sqldiff.c 2a0987d183027c795ced13d6749061c1d2f38e24eddb428f56fa64c3a8f51e4b
 F tool/sqlite3-rsync.c 187b262035c1159b047dbfa1959c168b87b5a153b63465e8c8bd1b54fabf4460
-F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f
+F tool/sqlite3_analyzer.c.in 348ba349bbdc93c9866439f9f935d7284866a2a4e6898bc906ae1204ade56918
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/src-verify.c 41c586dee84d0b190ad13e0282ed83d4a65ec9fefde9adf4943efdf6558eea7f
@@ -2215,8 +2215,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 086034c3508d95e4f620c5e0580fae770e85410b0c8bd94f600fc0fd25088947
-R d688762d4b1334b98cdf41bc1c1c4c96
+P 18f784c47d4252bc3696a7e084a1afb9f51f006cf2021292f2103531b8235226
+R f37703682204a6532c10f65be42e5cd4
 U drh
-Z 9855069890c5f74ec21934036ad0fa9f
+Z 64787aa4f9a8932f50b4106ef4d8ed62
 # Remove this line to create a well-formed Fossil manifest.
index f7119b107ea6cc057dc0d07ccf9c4f56fac86566..c8fe7fce57b187ed2ab9ca695741e951706a0dd2 100644 (file)
@@ -1 +1 @@
-18f784c47d4252bc3696a7e084a1afb9f51f006cf2021292f2103531b8235226
+7c1c1226d803dbaf8e75085b1cc2aad88aef4c3168288e587c8c736633d09054
index 2d799ed250f9c9505b58504aef8626a2aeff6c07..1c9fc836a11c50751e89d9cc6646891f84e00a6e 100644 (file)
@@ -20,8 +20,8 @@ INCLUDE sqlite3.c
 INCLUDE $ROOT/src/tclsqlite.c
 
 #if defined(_WIN32)
-INCLUDE $ROOT/ext/consio/console_io.h
-INCLUDE $ROOT/ext/consio/console_io.c
+INCLUDE $ROOT/ext/misc/sqlite3_stdio.h
+INCLUDE $ROOT/ext/misc/sqlite3_stdio.c
 
 /* Substitute "puts" command.  Only these forms recognized:
 **
@@ -56,8 +56,8 @@ static int subst_puts(
       return TCL_ERROR;
     }
   }
-  fPutsUtf8(zOut, pOut);
-  if( addNewLine ) fPutsUtf8("\n", pOut);
+  sqlite3_fputs(zOut, pOut);
+  if( addNewLine ) sqlite3_fputs("\n", pOut);
   return TCL_OK;
 }
 #endif /* defined(_WIN32) */