Move console_io lib to its own subdirectory, etc/consio .

FossilOrigin-Name: 1d0583f2eb69fdca1cbc55763c0e86a7e32cb7771bfbc2cdf02da4e3fedbfa23

diff --git a/src/console_io.c b/ext/consio/console_io.c
similarity index 100%
rename from src/console_io.c
rename to ext/consio/console_io.c

diff --git a/src/console_io.h b/ext/consio/console_io.h
similarity index 100%
rename from src/console_io.h
rename to ext/consio/console_io.h

diff --git a/manifest b/manifest
index 34234276c13b04d7891ca751ded8836ec741cd30..6fec7ee4b3e51c7bc10624eda9931255dcbe5359 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Some\srenaming,\swarnings\scured,\sand\smore\scoding\sconvention\sconformance.
-D 2023-11-06T15:15:58.179
+C Move\sconsole_io\slib\sto\sits\sown\ssubdirectory,\setc/consio\s.
+D 2023-11-06T15:31:08.971
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -50,6 +50,8 @@ F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
 F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91
 F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad1aff3294f94
 F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a
+F ext/consio/console_io.c 7c9d44ae378855778b7c4bb171df336e5f0e629107e56d93fcaaa41b512d253d x src/console_io.c
+F ext/consio/console_io.h 92a765da11922b57c899132fd31fb9f6a54802d9ca2489e618a66b7d5334acb9 w src/console_io.h
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
 F ext/expert/expert1.test 0dd5cb096d66bed593e33053a3b364f6ef52ed72064bf5cf298364636dbf3cd6
@@ -669,8 +671,6 @@ F src/btreeInt.h ef12a72b708677e48d6bc8dcd66fed25434740568b89e2cfa368093cfc5b9d1
 F src/build.c 189e4517d67f09f0a3e0d8e1faa6e2ef0c2e95f6ac82e33c912cb7efa2a359cc
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/console_io.c 7c9d44ae378855778b7c4bb171df336e5f0e629107e56d93fcaaa41b512d253d x
-F src/console_io.h 92a765da11922b57c899132fd31fb9f6a54802d9ca2489e618a66b7d5334acb9
 F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
 F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
@@ -727,7 +727,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a19daa26e95f7245106a31f288b2f50c72d1f2cc156703f04c8c91450e111515
-F src/shell.c.in d1fdac3c508f939554c1e11694d36ce30645febfc653a91a2bdb78a75b65bb7a
+F src/shell.c.in 012b84f928dc883b589e27086540df7317b8b465d366b6baac2717b07f59ee0c
 F src/sqlite.h.in ef0e41e83ad1ac0dcc9ec9939bf541a44b1c5de821bee2d6c61754c3252f3276
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2144,8 +2144,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 d661f90724b1bd31948169841bacb80ba4ae91b52191a0b0021a89a22d932a02
-R 51e773e98c65b583317374019e2b48c6
+P 58815f0ad259599a674e7d0fe0d4676a1c4fb8e118c08b619580ff655fb3be40
+R 9369b16a7548c239ad37858f67dafede
 U larrybr
-Z 7c8e9716e1490034796ed7b1b7236e3d
+Z ed8eeffcaf90e73880f84d59f5812858
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 90ab247018124790ce88220cdf13633e23102657..55b7016ccfbdd911f2e41e58fb0bd06161cda08f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58815f0ad259599a674e7d0fe0d4676a1c4fb8e118c08b619580ff655fb3be40
\ No newline at end of file
+1d0583f2eb69fdca1cbc55763c0e86a7e32cb7771bfbc2cdf02da4e3fedbfa23
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 009b9d43182cbfcf9a68b62c22e583c0b8016267..b4a0d1936fc5379305a454946c70e6ff0af79767 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -239,8 +239,8 @@ extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
 
 #define SQLITE_INTERNAL_LINKAGE static
 
-INCLUDE console_io.h
-INCLUDE console_io.c
+INCLUDE ../ext/consio/console_io.h
+INCLUDE ../ext/consio/console_io.c
 
 /* True if the timer is enabled */
 static int enableTimer = 0;