From 6cc16fc07066ece41e82400b8059693eb7ff93fe Mon Sep 17 00:00:00 2001 From: mistachkin Date: Sat, 23 Jan 2016 01:54:15 +0000 Subject: [PATCH 01/12] Cleanup localtime() support for Windows CE. FossilOrigin-Name: 39759a553208d8ef72964bdd539a0883e1d99cf6 --- manifest | 19 +++++++++++-------- manifest.uuid | 2 +- src/date.c | 2 +- src/os_win.c | 14 +++++++++----- src/sqliteInt.h | 10 ++++++++++ 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index 61cf5d66ed..257bc12719 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\swork\son\sthe\sMSVC\sbuild. -D 2016-01-23T00:07:51.151 +C Cleanup\slocaltime()\ssupport\sfor\sWindows\sCE. +D 2016-01-23T01:54:15.466 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9 @@ -295,7 +295,7 @@ F src/build.c b4eba1e84752ec9cae7ff3dacd5a8b6d1ab8deb9 F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 -F src/date.c 997651e3ee6c2818fbf7fcdb7156cef9eb3ece20 +F src/date.c 6142d9e4d25fa5ec78f44644c411ee64b5bfbdd0 F src/dbstat.c b2ec6793eef97aebb4d171d490a4ffdfa9f2475c F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da F src/expr.c d10c1cdef5810cdbf73adc9f9b383684230b360a @@ -330,7 +330,7 @@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c 0eb7f469fcd4e1fbedf30060438e26b839ec5486 -F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811 +F src/os_win.c 3cd1dbb6800a1996f25c027850e512d0631d4cf6 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c f4e9ac39fbb1e0fde97af85c0f4e00eb90764b67 F src/pager.h 1c2a49143dfba9e69cc8159ef019f472ed8d260b @@ -350,7 +350,7 @@ F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4 F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d -F src/sqliteInt.h 74e10a74116df0aec9d4a3e134f1a86cc34c2f14 +F src/sqliteInt.h ba1dd2b253f256353493c674425b54e0cd1e2409 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e @@ -1419,7 +1419,10 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a1c8116ced62d81f3f5ca26bbe0877e829d4cc56 -R b34246fa017fc0ae2e7bf7cb484e3eeb +P a79c46bc61a35edbaf6112c26e8052314b0eb16a +R 84f9a6399ea3db7dae9e4103397ece9e +T *branch * winCeLocalTime +T *sym-winCeLocalTime * +T -sym-trunk * U mistachkin -Z ba075ff448ff99fa520b3503324fe6e9 +Z 786b4c57551387fde5512893dcf278e2 diff --git a/manifest.uuid b/manifest.uuid index d1ea2b33a4..4891a746f3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a79c46bc61a35edbaf6112c26e8052314b0eb16a \ No newline at end of file +39759a553208d8ef72964bdd539a0883e1d99cf6 \ No newline at end of file diff --git a/src/date.c b/src/date.c index d78e83cf57..7d013316ad 100644 --- a/src/date.c +++ b/src/date.c @@ -418,6 +418,7 @@ static void clearYMD_HMS_TZ(DateTime *p){ p->validTZ = 0; } +#ifndef SQLITE_OMIT_LOCALTIME /* ** On recent Windows platforms, the localtime_s() function is available ** as part of the "Secure CRT". It is essentially equivalent to @@ -436,7 +437,6 @@ static void clearYMD_HMS_TZ(DateTime *p){ #define HAVE_LOCALTIME_S 1 #endif -#ifndef SQLITE_OMIT_LOCALTIME /* ** The following routine implements the rough equivalent of localtime_r() ** using whatever operating-system specific localtime facility that diff --git a/src/os_win.c b/src/os_win.c index c54bfd6a90..d46eb77c52 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -1986,16 +1986,16 @@ static void winLogIoerr(int nRetry, int lineno){ } } -#if SQLITE_OS_WINCE -/************************************************************************* -** This section contains code for WinCE only. +/* +** This #if cannot use SQLITE_OS_WINCE because the corresponding section +** in "sqliteInt.h" does not use it. */ -#if !defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API +#if defined(_WIN32_WCE) && \ + (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) /* ** The MSVC CRT on Windows CE may not have a localtime() function. So ** create a substitute. */ -#include struct tm *__cdecl localtime(const time_t *t) { static struct tm y; @@ -2019,6 +2019,10 @@ struct tm *__cdecl localtime(const time_t *t) } #endif +#if SQLITE_OS_WINCE +/************************************************************************* +** This section contains code for WinCE only. +*/ #define HANDLE_TO_WINFILE(a) (winFile*)&((char*)a)[-(int)offsetof(winFile,h)] /* diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 1a8a5d3a5b..46abeb0de1 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -218,6 +218,16 @@ # endif #endif +/* +** The MSVC CRT on Windows CE may not have a localtime() function. So +** declare a substitute. The function itself is defined in "os_win.c". +*/ +#if defined(_WIN32_WCE) && \ + (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) +# include +struct tm *__cdecl localtime(const time_t *); +#endif + /* ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2. ** 0 means mutexes are permanently disable and the library is never From 0e188e1d1eb0e8eb51ad0a5526af963284f47886 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Mon, 11 Apr 2016 22:10:26 +0000 Subject: [PATCH 02/12] Fix some compilation issues. FossilOrigin-Name: 016481b39f8b23b4f0f851053068d8eaee6122e1 --- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/os_win.c | 20 +++++++++++++------- src/sqliteInt.h | 10 ---------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/manifest b/manifest index 2ba8a3c8f7..c7a5b46f3b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\supdates\sfrom\strunk. -D 2016-04-05T17:59:56.435 +C Fix\ssome\scompilation\sissues. +D 2016-04-11T22:10:26.085 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a @@ -13,7 +13,7 @@ F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am 42f7eb1fb2b06ddd6c6adab3e4388cc0a237ba40 F autoconf/Makefile.msc dc0d0500e4a827cb3891d08d846dd6dd40241b51 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7 -F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1 w autoconf/README +F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1 F autoconf/configure.ac d807b567f73a2b0986ccdd206b782cecb4d08fff F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873 @@ -360,7 +360,7 @@ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec -F src/os_win.c be21cb97d7c679a27851d85c26ddc3a80ffb2ec5 +F src/os_win.c 1245c1c1b03f269f8beca1464df2f9a174236dab F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56 @@ -380,7 +380,7 @@ F src/shell.c b7922fa264f8c8d72a5ec6dd0b091e15a93c4de5 F src/sqlite.h.in 7f437b068314f053e6417d452c59f08d05092591 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2 -F src/sqliteInt.h 8da202a3a7874497db07fae72c1f94ca6522a6c3 +F src/sqliteInt.h 594bf31a7a0cc788688ca947e562576e23bd7904 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 @@ -1012,7 +1012,7 @@ F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7 F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3 -F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test +F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285 F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5 @@ -1378,7 +1378,7 @@ F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2 F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7 F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767 F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b -F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test +F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31 F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 39759a553208d8ef72964bdd539a0883e1d99cf6 cf569f9f2fab1828e4bfced111fd9a6ee23ea8c0 -R d0ec40008a4450baf3f01589e83f54d1 +P 00990020d07d7c87b922cdbfa5373298a86bb4b3 +R b5c956e1077b7c3e444e8f4ed923bce8 U mistachkin -Z eaa4bb84d513df9cfd663fcd7451f96e +Z 76d8e561edd13c0c75a00b4aec6f1897 diff --git a/manifest.uuid b/manifest.uuid index 7454ecb7b8..1b33607050 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -00990020d07d7c87b922cdbfa5373298a86bb4b3 \ No newline at end of file +016481b39f8b23b4f0f851053068d8eaee6122e1 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 518155d037..698c5af861 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -25,6 +25,16 @@ */ #include "os_win.h" +/* +** The MSVC CRT on Windows CE may not have a localtime() function. So +** declare a substitute. +*/ +#if SQLITE_OS_WINCE && \ + (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) +# include +struct tm *__cdecl localtime(const time_t *); +#endif + /* ** Compiling and using WAL mode requires several APIs that are only ** available in Windows platforms based on the NT kernel. @@ -2118,16 +2128,12 @@ static void winLogIoerr(int nRetry, int lineno){ } } -/* -** This #if cannot use SQLITE_OS_WINCE because the corresponding section -** in "sqliteInt.h" does not use it. -*/ -#if defined(_WIN32_WCE) && \ - (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) /* ** The MSVC CRT on Windows CE may not have a localtime() function. So -** create a substitute. +** define a substitute. */ +#if SQLITE_OS_WINCE && \ + (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) struct tm *__cdecl localtime(const time_t *t) { static struct tm y; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 8a4aa378fa..d789cc00e4 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -211,16 +211,6 @@ # endif #endif -/* -** The MSVC CRT on Windows CE may not have a localtime() function. So -** declare a substitute. The function itself is defined in "os_win.c". -*/ -#if defined(_WIN32_WCE) && \ - (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) -# include -struct tm *__cdecl localtime(const time_t *); -#endif - /* ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2. ** 0 means mutexes are permanently disable and the library is never From 0cedb963a3c0af74b77ede4a333ead2bc221eced Mon Sep 17 00:00:00 2001 From: mistachkin Date: Mon, 11 Apr 2016 22:45:45 +0000 Subject: [PATCH 03/12] Further refinements. FossilOrigin-Name: b35bb928b25492f6dd71ccf9c250cb9f0cce09ff --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/date.c | 8 ++++++++ src/os_win.c | 13 ++----------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index 4bfcc161a3..9eda7911ed 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\supdates\sfrom\strunk. -D 2016-04-11T22:24:03.058 +C Further\srefinements. +D 2016-04-11T22:45:45.699 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -326,7 +326,7 @@ F src/build.c 1944d95f0250ec72dab939f8319a12e237aaad61 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 -F src/date.c cd412cb2adb0c3a60e085107864931e508f45ad8 +F src/date.c b25819151358a5598a1beaf0da370692ce4a70d1 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e F src/expr.c 17d4e745ef6a3fd2e4ef863f5f9a4912f1ba1198 @@ -360,7 +360,7 @@ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b -F src/os_win.c 1245c1c1b03f269f8beca1464df2f9a174236dab +F src/os_win.c 9c84a48d56074d36866775a76089da69acb21594 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 016481b39f8b23b4f0f851053068d8eaee6122e1 3189a7f1851f823218d85a2455bf218d00d81543 -R 7558a8a571dae2778f18625aa658ad38 +P b8094166b3c6a8ec7913b403e08b5e6790fb03c1 +R 10b47efb260a3b41bbe92a309e042fe1 U mistachkin -Z b10810d48122d46da89a3713378b4792 +Z 8cdaf1bfaef399409db07428454eae07 diff --git a/manifest.uuid b/manifest.uuid index e418fefec5..3add6fef53 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b8094166b3c6a8ec7913b403e08b5e6790fb03c1 \ No newline at end of file +b35bb928b25492f6dd71ccf9c250cb9f0cce09ff \ No newline at end of file diff --git a/src/date.c b/src/date.c index 02f7d4f01f..182b7d594d 100644 --- a/src/date.c +++ b/src/date.c @@ -50,6 +50,14 @@ #ifndef SQLITE_OMIT_DATETIME_FUNCS +/* +** The MSVC CRT on Windows CE may not have a localtime() function. So +** declare a substitute. +*/ +#if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \ + (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) +struct tm *__cdecl localtime(const time_t *); +#endif /* ** A structure for holding a single date and time. diff --git a/src/os_win.c b/src/os_win.c index 698c5af861..d6156d7bbf 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -25,16 +25,6 @@ */ #include "os_win.h" -/* -** The MSVC CRT on Windows CE may not have a localtime() function. So -** declare a substitute. -*/ -#if SQLITE_OS_WINCE && \ - (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) -# include -struct tm *__cdecl localtime(const time_t *); -#endif - /* ** Compiling and using WAL mode requires several APIs that are only ** available in Windows platforms based on the NT kernel. @@ -2132,8 +2122,9 @@ static void winLogIoerr(int nRetry, int lineno){ ** The MSVC CRT on Windows CE may not have a localtime() function. So ** define a substitute. */ -#if SQLITE_OS_WINCE && \ +#if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \ (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) +# include struct tm *__cdecl localtime(const time_t *t) { static struct tm y; From 8366ddf24267097686f8418d4d5afbc027dac8c7 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 12 Apr 2016 16:11:52 +0000 Subject: [PATCH 04/12] Add and adjust comments. FossilOrigin-Name: 541c6da23850673f5d2a2e31c3967b796ee2effc --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/date.c | 5 +++-- src/os_win.c | 8 ++++++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 9eda7911ed..5d71ad29a9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Further\srefinements. -D 2016-04-11T22:45:45.699 +C Add\sand\sadjust\scomments. +D 2016-04-12T16:11:52.808 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -326,7 +326,7 @@ F src/build.c 1944d95f0250ec72dab939f8319a12e237aaad61 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 -F src/date.c b25819151358a5598a1beaf0da370692ce4a70d1 +F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e F src/expr.c 17d4e745ef6a3fd2e4ef863f5f9a4912f1ba1198 @@ -360,7 +360,7 @@ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b -F src/os_win.c 9c84a48d56074d36866775a76089da69acb21594 +F src/os_win.c b169437dff859e308b3726594094a2f8ca922941 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b8094166b3c6a8ec7913b403e08b5e6790fb03c1 -R 10b47efb260a3b41bbe92a309e042fe1 +P b35bb928b25492f6dd71ccf9c250cb9f0cce09ff +R 042928a9099251248649d958d8ea8130 U mistachkin -Z 8cdaf1bfaef399409db07428454eae07 +Z 2dd922c09a9ceb4b9c3491d0203a672b diff --git a/manifest.uuid b/manifest.uuid index 3add6fef53..376b8b5755 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b35bb928b25492f6dd71ccf9c250cb9f0cce09ff \ No newline at end of file +541c6da23850673f5d2a2e31c3967b796ee2effc \ No newline at end of file diff --git a/src/date.c b/src/date.c index 182b7d594d..cce16305a3 100644 --- a/src/date.c +++ b/src/date.c @@ -51,8 +51,9 @@ #ifndef SQLITE_OMIT_DATETIME_FUNCS /* -** The MSVC CRT on Windows CE may not have a localtime() function. So -** declare a substitute. +** The MSVC CRT on Windows CE may not have a localtime() function. +** So declare a substitute. The substitute function itself is +** defined in "os_win.c". */ #if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \ (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) diff --git a/src/os_win.c b/src/os_win.c index d6156d7bbf..929ad346cc 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2119,11 +2119,15 @@ static void winLogIoerr(int nRetry, int lineno){ } /* -** The MSVC CRT on Windows CE may not have a localtime() function. So -** define a substitute. +** This #if does not rely on the SQLITE_OS_WINCE define because the +** corresponding section in "date.c" cannot use it. */ #if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \ (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) +/* +** The MSVC CRT on Windows CE may not have a localtime() function. +** So define a substitute. +*/ # include struct tm *__cdecl localtime(const time_t *t) { From 2160ca5f8ddbd29a89bf7d194e282fbaeff73a3e Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 12 Apr 2016 16:59:39 +0000 Subject: [PATCH 05/12] Add the --temp option to the speedtest1.c performance test program. FossilOrigin-Name: 8053a6e2bf616fc9326f0323962176e318d7d2a5 --- manifest | 13 ++++++------- manifest.uuid | 2 +- test/speedtest1.c | 35 ++++++++++++++++++++++++++--------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index ff7a1468a7..6ca8cb5234 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improved\slocaltime()\ssupport\sfor\sWindowsCE -D 2016-04-12T16:23:30.244 +C Add\sthe\s--temp\soption\sto\sthe\sspeedtest1.c\sperformance\stest\sprogram. +D 2016-04-12T16:59:39.643 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -1083,7 +1083,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b -F test/speedtest1.c 21af8db2492a903835b654517ac8d90aed0af91f +F test/speedtest1.c 870ea1f3086ace7125f578cfae7ac1137b3e0bdd F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -1482,8 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7e7289655185e7643ead6d685922528bc4d9e0ae 541c6da23850673f5d2a2e31c3967b796ee2effc -R ff0c266585dc1c24384af2892b8942ce -T +closed 541c6da23850673f5d2a2e31c3967b796ee2effc +P 662c32af0276a9ef4eea2d29e2523ccc44b6d128 +R cf025f2af3ea009a3845c13fd71354e9 U drh -Z 2794cf8f4a03e9c72f55b1cbc1df2c40 +Z ba428edd13c3659c3e56c28f6b7f2005 diff --git a/manifest.uuid b/manifest.uuid index 1e27f6a99e..3197cf8598 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -662c32af0276a9ef4eea2d29e2523ccc44b6d128 \ No newline at end of file +8053a6e2bf616fc9326f0323962176e318d7d2a5 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index 8ed0424f88..bcd85b049b 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -30,6 +30,7 @@ static const char zHelp[] = " --shrink-memory Invoke sqlite3_db_release_memory() frequently.\n" " --size N Relative test size. Default=100\n" " --stats Show statistics at the end\n" + " --temp N N from 0 to 9. 0: no temp table. 9: all temp tables\n" " --testset T Run test-set T\n" " --trace Turn on SQL tracing\n" " --threads N Use up to N threads for sorting\n" @@ -69,6 +70,7 @@ static struct Global { int bExplain; /* Print SQL with EXPLAIN prefix */ int bVerify; /* Try to verify that results are correct */ int bMemShrink; /* Call sqlite3_db_release_memory() often */ + int eTemp; /* 0: no TEMP. 9: always TEMP. */ int szTest; /* Scale factor for test iterations */ const char *zWR; /* Might be WITHOUT ROWID */ const char *zNN; /* Might be NOT NULL */ @@ -78,6 +80,12 @@ static struct Global { char zResult[3000]; /* Text of the current result */ } g; +/* Return " TEMP" or "", as appropriate for creating a table. +*/ +static const char *isTemp(int N){ + return g.eTemp>=N ? " TEMP" : ""; +} + /* Print an error message and exit */ static void fatal_error(const char *zMsg, ...){ @@ -459,8 +467,8 @@ void testset_main(void){ maxb = roundup_allones(sz); speedtest1_begin_test(100, "%d INSERTs into table with no index", n); speedtest1_exec("BEGIN"); - speedtest1_exec("CREATE TABLE t1(a INTEGER %s, b INTEGER %s, c TEXT %s);", - g.zNN, g.zNN, g.zNN); + speedtest1_exec("CREATE%s TABLE t1(a INTEGER %s, b INTEGER %s, c TEXT %s);", + isTemp(9), g.zNN, g.zNN, g.zNN); speedtest1_prepare("INSERT INTO t1 VALUES(?1,?2,?3); -- %d times", n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -477,8 +485,9 @@ void testset_main(void){ n = sz; speedtest1_begin_test(110, "%d ordered INSERTS with one index/PK", n); speedtest1_exec("BEGIN"); - speedtest1_exec("CREATE TABLE t2(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", - g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); + speedtest1_exec( + "CREATE%s TABLE t2(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", + isTemp(5), g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); speedtest1_prepare("INSERT INTO t2 VALUES(?1,?2,?3); -- %d times", n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -495,8 +504,9 @@ void testset_main(void){ n = sz; speedtest1_begin_test(120, "%d unordered INSERTS with one index/PK", n); speedtest1_exec("BEGIN"); - speedtest1_exec("CREATE TABLE t3(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", - g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); + speedtest1_exec( + "CREATE%s TABLE t3(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", + isTemp(3), g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); speedtest1_prepare("INSERT INTO t3 VALUES(?1,?2,?3); -- %d times", n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -654,12 +664,12 @@ void testset_main(void){ speedtest1_begin_test(180, "%d INSERTS with three indexes", n); speedtest1_exec("BEGIN"); speedtest1_exec( - "CREATE TABLE t4(\n" + "CREATE%s TABLE t4(\n" " a INTEGER %s %s,\n" " b INTEGER %s,\n" " c TEXT %s\n" ") %s", - g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); + isTemp(1), g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); speedtest1_exec("CREATE INDEX t4b ON t4(b)"); speedtest1_exec("CREATE INDEX t4c ON t4(c)"); speedtest1_exec("INSERT INTO t4 SELECT * FROM t1"); @@ -1047,7 +1057,7 @@ void testset_rtree(int p1, int p2){ speedtest1_end_test(); speedtest1_begin_test(101, "Copy from rtree to a regular table"); - speedtest1_exec("CREATE TABLE t1(id INTEGER PRIMARY KEY,x0,x1,y0,y1,z0,z1)"); + speedtest1_exec(" TABLE t1(id INTEGER PRIMARY KEY,x0,x1,y0,y1,z0,z1)"); speedtest1_exec("INSERT INTO t1 SELECT * FROM rt1"); speedtest1_end_test(); @@ -1321,6 +1331,13 @@ int main(int argc, char **argv){ g.szTest = integerValue(argv[++i]); }else if( strcmp(z,"stats")==0 ){ showStats = 1; + }else if( strcmp(z,"temp")==0 ){ + if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + i++; + if( argv[i][0]<'0' || argv[i][0]>'9' || argv[i][1]!=0 ){ + fatal_error("argument to --temp should be integer between 0 and 9"); + } + g.eTemp = argv[i][0] - '0'; }else if( strcmp(z,"testset")==0 ){ if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); zTSet = argv[++i]; From 741c2772dbdbc55e31de0c2201c380e25ce28315 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 12 Apr 2016 17:13:33 +0000 Subject: [PATCH 06/12] Fix speedtest1 so that it automatically unlinks its test database prior to startup. FossilOrigin-Name: b65b69f6b686c6555876b6fc701da95cc49120b5 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/speedtest1.c | 6 +----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 6ca8cb5234..2d86b5ab27 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s--temp\soption\sto\sthe\sspeedtest1.c\sperformance\stest\sprogram. -D 2016-04-12T16:59:39.643 +C Fix\sspeedtest1\sso\sthat\sit\sautomatically\sunlinks\sits\stest\sdatabase\sprior\nto\sstartup. +D 2016-04-12T17:13:33.302 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -1083,7 +1083,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b -F test/speedtest1.c 870ea1f3086ace7125f578cfae7ac1137b3e0bdd +F test/speedtest1.c 4476f7030775507f060d27b789e1f4123c5a5866 F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 662c32af0276a9ef4eea2d29e2523ccc44b6d128 -R cf025f2af3ea009a3845c13fd71354e9 +P 8053a6e2bf616fc9326f0323962176e318d7d2a5 +R 3ae5c3c6eb252cc89c8a785d5876dd69 U drh -Z ba428edd13c3659c3e56c28f6b7f2005 +Z 19aed5e20f081d47becc5b2db0de637c diff --git a/manifest.uuid b/manifest.uuid index 3197cf8598..a2fb631158 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8053a6e2bf616fc9326f0323962176e318d7d2a5 \ No newline at end of file +b65b69f6b686c6555876b6fc701da95cc49120b5 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index bcd85b049b..2d337d4705 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -1369,11 +1369,7 @@ int main(int argc, char **argv){ argv[i], argv[0]); } } -#if 0 - if( zDbName==0 ){ - fatal_error(zHelp, argv[0]); - } -#endif + if( zDbName!=0 ) unlink(zDbName); #if SQLITE_VERSION_NUMBER>=3006001 if( nHeap>0 ){ pHeap = malloc( nHeap ); From 74f598b6773eba45fb78e35ba8af54ad7706e840 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 12 Apr 2016 19:20:22 +0000 Subject: [PATCH 07/12] Fix harmless compiler warnings in the 'session' module. FossilOrigin-Name: a18a6ce2271865d04cd75a8a5baa63798b7393db --- ext/session/sqlite3session.c | 6 +++--- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c index 437549dd70..62a502ed0a 100644 --- a/ext/session/sqlite3session.c +++ b/ext/session/sqlite3session.c @@ -935,9 +935,9 @@ static int sessionTableInfo( int nDbCol = 0; int nThis; int i; - u8 *pAlloc; + u8 *pAlloc = 0; char **azCol = 0; - u8 *abPK; + u8 *abPK = 0; assert( pazCol && pabPK ); @@ -3655,7 +3655,7 @@ static int sessionConflictHandler( void *pCtx, /* First argument for conflict handler */ int *pbReplace /* OUT: Set to true if PK row is found */ ){ - int res; /* Value returned by conflict handler */ + int res = 0; /* Value returned by conflict handler */ int rc; int nCol; int op; diff --git a/manifest b/manifest index 2d86b5ab27..63ef5a75e5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sspeedtest1\sso\sthat\sit\sautomatically\sunlinks\sits\stest\sdatabase\sprior\nto\sstartup. -D 2016-04-12T17:13:33.302 +C Fix\sharmless\scompiler\swarnings\sin\sthe\s'session'\smodule. +D 2016-04-12T19:20:22.748 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -291,7 +291,7 @@ F ext/session/sessionG.test 01ef705096a9d3984eebdcca79807a211dee1b60 F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596 F ext/session/sessionfault.test d52cbb7bee48cc8ee80335e07eb72fcb6b15eb40 F ext/session/sessionfault2.test ac1dfd77a0fb0ea310aee40a16645ef1b66d3f88 -F ext/session/sqlite3session.c 2fc72bd989c424a15802da766c7ebd8eed47bcf6 +F ext/session/sqlite3session.c 7cd68ba5ecd42b67f81b35e1b745377b930321dc F ext/session/sqlite3session.h 64e9e7f185725ef43b97f4a9a0c0df0669844f1d F ext/session/test_session.c 187bd344c5ae9d5be85e22ef7c3010f0c17307ce F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 8053a6e2bf616fc9326f0323962176e318d7d2a5 -R 3ae5c3c6eb252cc89c8a785d5876dd69 -U drh -Z 19aed5e20f081d47becc5b2db0de637c +P b65b69f6b686c6555876b6fc701da95cc49120b5 +R ccc0acaae74ee3b966fc3362e59511d7 +U mistachkin +Z 60a8c701bde6b1e9a5a93858cf1bfd0c diff --git a/manifest.uuid b/manifest.uuid index a2fb631158..7e644ceda9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b65b69f6b686c6555876b6fc701da95cc49120b5 \ No newline at end of file +a18a6ce2271865d04cd75a8a5baa63798b7393db \ No newline at end of file From 02267cc2136bc3cde2ae9cc3a02f91e2dc497793 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 12 Apr 2016 19:30:31 +0000 Subject: [PATCH 08/12] Compilation fix for a C99-ism in the 'fts3view' tool. FossilOrigin-Name: bedb88a4b9c808ea781ae69058399a1a3a3d15fa --- ext/fts3/tool/fts3view.c | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/fts3/tool/fts3view.c b/ext/fts3/tool/fts3view.c index a8d7981af0..37f9b7396d 100644 --- a/ext/fts3/tool/fts3view.c +++ b/ext/fts3/tool/fts3view.c @@ -398,8 +398,8 @@ static void showSegmentStats(sqlite3 *db, const char *zTab){ if( sqlite3_step(pStmt)==SQLITE_ROW && (nLeaf = sqlite3_column_int(pStmt, 0))>0 ){ - nIdx = sqlite3_column_int(pStmt, 5); sqlite3_int64 sz; + nIdx = sqlite3_column_int(pStmt, 5); printf("For level %d:\n", i); printf(" Number of indexes...................... %9d\n", nIdx); printf(" Number of leaf segments................ %9d\n", nLeaf); diff --git a/manifest b/manifest index 63ef5a75e5..ef6f2bcf49 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sharmless\scompiler\swarnings\sin\sthe\s'session'\smodule. -D 2016-04-12T19:20:22.748 +C Compilation\sfix\sfor\sa\sC99-ism\sin\sthe\s'fts3view'\stool. +D 2016-04-12T19:30:31.230 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -91,7 +91,7 @@ F ext/fts3/fts3_unicode2.c c3d01968d497bd7001e7dc774ba75b372738c057 F ext/fts3/fts3_write.c c3863f23b6b4623c8b9d5cf31c12ce4469f78ca9 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100 -F ext/fts3/tool/fts3view.c 5d78b668f4e9598af9147f8999632599fb0d9dd5 +F ext/fts3/tool/fts3view.c 202801a2056995b763864d60c2dee744d46f1677 F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7 F ext/fts3/unicode/mkunicode.tcl 2debed3f582d77b3fdd0b8830880250021571fd8 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b65b69f6b686c6555876b6fc701da95cc49120b5 -R ccc0acaae74ee3b966fc3362e59511d7 +P a18a6ce2271865d04cd75a8a5baa63798b7393db +R d725baf71b4a1cdc4415395863dd2840 U mistachkin -Z 60a8c701bde6b1e9a5a93858cf1bfd0c +Z 4008d4d2d72bf9083c3fc9e1b20a35f7 diff --git a/manifest.uuid b/manifest.uuid index 7e644ceda9..42ae789fd7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a18a6ce2271865d04cd75a8a5baa63798b7393db \ No newline at end of file +bedb88a4b9c808ea781ae69058399a1a3a3d15fa \ No newline at end of file From 77fac879d25b6500d3bd028a8e855fc9dc789634 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 12 Apr 2016 20:05:06 +0000 Subject: [PATCH 09/12] More harmless compiler warning fixes. FossilOrigin-Name: ab69527c1608da0b668f3b49e967661dd99cc3d4 --- ext/fts3/fts3_test.c | 2 +- ext/fts5/fts5_hash.c | 4 ++-- ext/fts5/fts5_index.c | 2 +- ext/misc/amatch.c | 8 ++++---- ext/misc/fuzzer.c | 4 ++-- ext/misc/regexp.c | 10 +++++----- ext/misc/spellfix.c | 20 ++++++++++---------- ext/rbu/sqlite3rbu.c | 2 +- manifest | 39 +++++++++++++++++++++------------------ manifest.uuid | 2 +- src/test_multiplex.c | 4 ++-- src/test_onefile.c | 2 +- src/test_osinst.c | 6 +++--- tool/logest.c | 2 +- tool/showdb.c | 4 ++-- 15 files changed, 57 insertions(+), 54 deletions(-) diff --git a/ext/fts3/fts3_test.c b/ext/fts3/fts3_test.c index dec977b916..2596e6dec7 100644 --- a/ext/fts3/fts3_test.c +++ b/ext/fts3/fts3_test.c @@ -458,7 +458,7 @@ static int testTokenizerNext( if( pCsr->iLangid & 0x00000001 ){ for(i=0; iaBuffer[i] = pToken[i]; }else{ - for(i=0; iaBuffer[i] = testTolower(pToken[i]); + for(i=0; iaBuffer[i] = (char)testTolower(pToken[i]); } pCsr->iToken++; pCsr->iInput = (int)(p - pCsr->aInput); diff --git a/ext/fts5/fts5_hash.c b/ext/fts5/fts5_hash.c index ada8bb16cb..afa2a30739 100644 --- a/ext/fts5/fts5_hash.c +++ b/ext/fts5/fts5_hash.c @@ -345,11 +345,11 @@ int sqlite3Fts5HashWrite( if( pHash->eDetail==FTS5_DETAIL_FULL ){ pPtr[p->nData++] = 0x01; p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iCol); - p->iCol = iCol; + p->iCol = (i16)iCol; p->iPos = 0; }else{ bNew = 1; - p->iCol = iPos = iCol; + p->iCol = (i16)(iPos = iCol); } } diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index 1200f5707b..1d5ebe1428 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -3244,7 +3244,7 @@ static void fts5IterSetOutputs_Col100(Fts5Iter *pIter, Fts5SegIter *pSeg){ if( aiCol==aiColEnd ) goto setoutputs_col_out; } if( *aiCol==iPrev ){ - *aOut++ = (iPrev - iPrevOut) + 2; + *aOut++ = (u8)((iPrev - iPrevOut) + 2); iPrevOut = iPrev; } } diff --git a/ext/misc/amatch.c b/ext/misc/amatch.c index 852491988a..efe76566ee 100644 --- a/ext/misc/amatch.c +++ b/ext/misc/amatch.c @@ -625,10 +625,10 @@ static int amatchLoadOneRule( }else{ memset(pRule, 0, sizeof(*pRule)); pRule->zFrom = &pRule->zTo[nTo+1]; - pRule->nFrom = nFrom; + pRule->nFrom = (amatch_len)nFrom; memcpy(pRule->zFrom, zFrom, nFrom+1); memcpy(pRule->zTo, zTo, nTo+1); - pRule->nTo = nTo; + pRule->nTo = (amatch_len)nTo; pRule->rCost = rCost; pRule->iLang = (int)iLang; } @@ -1081,7 +1081,7 @@ static void amatchAddWord( pWord->rCost = rCost; pWord->iSeq = pCur->nWord++; amatchWriteCost(pWord); - pWord->nMatch = nMatch; + pWord->nMatch = (short)nMatch; pWord->pNext = pCur->pAllWords; pCur->pAllWords = pWord; pWord->sCost.zKey = pWord->zCost; @@ -1162,7 +1162,7 @@ static int amatchNext(sqlite3_vtab_cursor *cur){ #endif nWord = (int)strlen(pWord->zWord+2); if( nWord+20>nBuf ){ - nBuf = nWord+100; + nBuf = (char)(nWord+100); zBuf = sqlite3_realloc(zBuf, nBuf); if( zBuf==0 ) return SQLITE_NOMEM; } diff --git a/ext/misc/fuzzer.c b/ext/misc/fuzzer.c index 3ed4b0a977..77db56d47a 100644 --- a/ext/misc/fuzzer.c +++ b/ext/misc/fuzzer.c @@ -344,10 +344,10 @@ static int fuzzerLoadOneRule( memset(pRule, 0, sizeof(*pRule)); pRule->zFrom = pRule->zTo; pRule->zFrom += nTo + 1; - pRule->nFrom = nFrom; + pRule->nFrom = (fuzzer_len)nFrom; memcpy(pRule->zFrom, zFrom, nFrom+1); memcpy(pRule->zTo, zTo, nTo+1); - pRule->nTo = nTo; + pRule->nTo = (fuzzer_len)nTo; pRule->rCost = nCost; pRule->iRuleset = (int)iRuleset; } diff --git a/ext/misc/regexp.c b/ext/misc/regexp.c index 7244d52998..b4a8ab5c04 100644 --- a/ext/misc/regexp.c +++ b/ext/misc/regexp.c @@ -136,7 +136,7 @@ struct ReCompiled { static void re_add_state(ReStateSet *pSet, int newState){ unsigned i; for(i=0; inState; i++) if( pSet->aState[i]==newState ) return; - pSet->aState[pSet->nState++] = newState; + pSet->aState[pSet->nState++] = (ReStateNumber)newState; } /* Extract the next unicode character from *pzIn and return it. Advance @@ -358,7 +358,7 @@ static int re_insert(ReCompiled *p, int iBefore, int op, int arg){ p->aArg[i] = p->aArg[i-1]; } p->nState++; - p->aOp[iBefore] = op; + p->aOp[iBefore] = (char)op; p->aArg[iBefore] = arg; return iBefore; } @@ -677,12 +677,12 @@ const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){ for(j=0, i=1; jzInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){ unsigned x = pRe->aArg[i]; if( x<=127 ){ - pRe->zInit[j++] = x; + pRe->zInit[j++] = (unsigned char)x; }else if( x<=0xfff ){ - pRe->zInit[j++] = 0xc0 | (x>>6); + pRe->zInit[j++] = (unsigned char)(0xc0 | (x>>6)); pRe->zInit[j++] = 0x80 | (x&0x3f); }else if( x<=0xffff ){ - pRe->zInit[j++] = 0xd0 | (x>>12); + pRe->zInit[j++] = (unsigned char)(0xd0 | (x>>12)); pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f); pRe->zInit[j++] = 0x80 | (x&0x3f); }else{ diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c index b5859ea2c8..cbcf8b7c5d 100644 --- a/ext/misc/spellfix.c +++ b/ext/misc/spellfix.c @@ -390,7 +390,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){ /* Special processing if either string is empty */ if( nA==0 ){ - cBprev = dc; + cBprev = (char)dc; for(xB=res=0; (cB = zB[xB])!=0; xB++){ res += insertOrDeleteCost(cBprev, cB, zB[xB+1])/FINAL_INS_COST_DIV; cBprev = cB; @@ -398,7 +398,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){ return res; } if( nB==0 ){ - cAprev = dc; + cAprev = (char)dc; for(xA=res=0; (cA = zA[xA])!=0; xA++){ res += insertOrDeleteCost(cAprev, cA, zA[xA+1]); cAprev = cA; @@ -420,8 +420,8 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){ /* Compute the Wagner edit distance */ m[0] = 0; - cx[0] = dc; - cBprev = dc; + cx[0] = (char)dc; + cBprev = (char)dc; for(xB=1; xB<=nB; xB++){ cBnext = zB[xB]; cB = zB[xB-1]; @@ -429,7 +429,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){ m[xB] = m[xB-1] + insertOrDeleteCost(cBprev, cB, cBnext); cBprev = cB; } - cAprev = dc; + cAprev = (char)dc; for(xA=1; xA<=nA; xA++){ int lastA = (xA==nA); cA = zA[xA-1]; @@ -476,7 +476,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){ d = m[xB]; dc = cx[xB]; m[xB] = totalCost; - cx[xB] = ncx; + cx[xB] = (char)ncx; cBprev = cB; } cAprev = cA; @@ -711,9 +711,9 @@ static int editDist3ConfigLoad( if( nExtra<0 ) nExtra = 0; pCost = sqlite3_malloc64( sizeof(*pCost) + nExtra ); if( pCost==0 ){ rc = SQLITE_NOMEM; break; } - pCost->nFrom = nFrom; - pCost->nTo = nTo; - pCost->iCost = iCost; + pCost->nFrom = (u8)nFrom; + pCost->nTo = (u8)nTo; + pCost->iCost = (u16)iCost; memcpy(pCost->a, zFrom, nFrom); memcpy(pCost->a + nFrom, zTo, nTo); pCost->pNext = pLang->pCost; @@ -1616,7 +1616,7 @@ static unsigned char *transliterate(const unsigned char *zIn, int nIn){ zIn += sz; nIn -= sz; if( c<=127 ){ - zOut[nOut++] = c; + zOut[nOut++] = (unsigned char)c; }else{ int xTop, xBtm, x; xTop = sizeof(translit)/sizeof(translit[0]) - 1; diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c index 93b756aa6a..f553ebdac5 100644 --- a/ext/rbu/sqlite3rbu.c +++ b/ext/rbu/sqlite3rbu.c @@ -3356,7 +3356,7 @@ sqlite3 *sqlite3rbu_db(sqlite3rbu *pRbu, int bRbu){ */ static void rbuEditErrmsg(sqlite3rbu *p){ if( p->rc==SQLITE_CONSTRAINT && p->zErrmsg ){ - int i; + unsigned int i; size_t nErrmsg = strlen(p->zErrmsg); for(i=0; i<(nErrmsg-8); i++){ if( memcmp(&p->zErrmsg[i], "rbu_imp_", 8)==0 ){ diff --git a/manifest b/manifest index ef6f2bcf49..ba0f2dffbe 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Compilation\sfix\sfor\sa\sC99-ism\sin\sthe\s'fts3view'\stool. -D 2016-04-12T19:30:31.230 +C More\sharmless\scompiler\swarning\sfixes. +D 2016-04-12T20:05:06.603 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -81,7 +81,7 @@ F ext/fts3/fts3_icu.c deb46f7020d87ea7a14a433fb7a7f4bef42a9652 F ext/fts3/fts3_porter.c 3565faf04b626cddf85f03825e86056a4562c009 F ext/fts3/fts3_snippet.c 68ae118b0f834ea53d2b89e4087fc0f0b8c4ee4e F ext/fts3/fts3_term.c 88c55a6fa1a51ab494e33dced0401a6c28791fd7 -F ext/fts3/fts3_test.c 11e36437b0f3f2266acea5b4787f615e4337a237 +F ext/fts3/fts3_test.c a940cf104d545ad1abf926956ce65db2aa5af0cf F ext/fts3/fts3_tokenize_vtab.c a27593ab19657166f6fa5ec073b678cc29a75860 F ext/fts3/fts3_tokenizer.c 3cf21cd2212db17a88d4ef7da0fd8a80275979a1 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3 @@ -103,8 +103,8 @@ F ext/fts5/fts5_aux.c daa57fb45216491814520bbb587e97bf81ced458 F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857 F ext/fts5/fts5_expr.c 5ca4bafe29aa3d27683c90e836192e4aefd20a3f -F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337 -F ext/fts5/fts5_index.c fdd82bb421a5d1e64d004acb43f4dd9970c8d2b3 +F ext/fts5/fts5_hash.c 880998e596b60f078348d48732ca4ad9a90caad2 +F ext/fts5/fts5_index.c b429e23fabb57506f71e406997cc46b89190dc97 F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55 F ext/fts5/fts5_storage.c 3309c6a8e34b974513016fd1ef47c83f5898f94c F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966 @@ -203,21 +203,21 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43 F ext/icu/icu.c 4bdf4c5daedabcd8e6eb6e6a377657f7b978f9f7 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 -F ext/misc/amatch.c a1a8f66c29d40bd71b075546ddeddb477b17a2bb +F ext/misc/amatch.c 211108e201105e4bb0c076527b8cfd34330fc234 F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704 F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f -F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767 +F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c F ext/misc/json1.c b9c88d5c3b6ecd8c731ffdd7f5b3d902857f8c96 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 -F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc +F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4 F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a F ext/misc/series.c e11e534ada797d5b816d7e7a93c022306563ca35 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 -F ext/misc/spellfix.c 598bbc45516227701558becdd38f4e6fe8e97cc2 +F ext/misc/spellfix.c bf1b922c2750698e9a3d4c50cce6974adb7e93be F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e @@ -246,7 +246,7 @@ F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06 F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda F ext/rbu/rbuprogress.test 2023a7df2c523e3df1cb532eff811cda385a789a F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48 -F ext/rbu/sqlite3rbu.c 007fc4db8c0b95c7ef10162b5864921ef5cc8106 +F ext/rbu/sqlite3rbu.c 9097f1d95666dbef72ca61d5b6a13a84660735ac F ext/rbu/sqlite3rbu.h d7cc99350c10134f358fe1a8997d9225b3f712b2 F ext/rbu/test_rbu.c 3505641a78b723589b8780d5f9b2faeeb73e037d F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 @@ -412,11 +412,11 @@ F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202 F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd F src/test_malloc.c 94c18e88d6df6d471a0d04ddb809f833d1739950 -F src/test_multiplex.c 6a9de820fcaaf506c59aa14bc8693822333cea48 +F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3 F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c -F src/test_onefile.c 38f7cbe79d5bafe95bde683cc3a53b8ca16daf10 -F src/test_osinst.c 5423dc1d355f594371f27dd292ca54bd320b8196 +F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f +F src/test_osinst.c ad0233b1dabb0390e25edded4ebd79a2a61538c6 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00 F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d @@ -1415,7 +1415,7 @@ F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce F tool/lemon.c cfbfe061a4b2766512f6b484882eee2c86a14506 F tool/lempar.c 404ea3dc27dbeed343f0e61b1d36e97b9f5f0fb6 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862 -F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6 +F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7 F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22 F tool/mkmsvcmin.tcl 2f12f7fa8858bbe61cf81820a2da96c79ed1ca8d @@ -1436,7 +1436,7 @@ F tool/replace.tcl 7727c60a04299b65a92f5e1590896fea0f25b9e0 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076 -F tool/showdb.c 82dca79a999b2701c62417636345e9974151fdad +F tool/showdb.c c695a5d5c8110640e0d9fadf5e254da90c79c36e F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818 F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68 F tool/showstat4.c bda40d6e395df7edb6e9ea630784d3d762c35b4b @@ -1482,7 +1482,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a18a6ce2271865d04cd75a8a5baa63798b7393db -R d725baf71b4a1cdc4415395863dd2840 +P bedb88a4b9c808ea781ae69058399a1a3a3d15fa +R 03018f5836a18841da04ba58f1cc328d +T *branch * warnings +T *sym-warnings * +T -sym-trunk * U mistachkin -Z 4008d4d2d72bf9083c3fc9e1b20a35f7 +Z baaf8c0d1237121c0d8a28eaa252b406 diff --git a/manifest.uuid b/manifest.uuid index 42ae789fd7..55b0fff735 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bedb88a4b9c808ea781ae69058399a1a3a3d15fa \ No newline at end of file +ab69527c1608da0b668f3b49e967661dd99cc3d4 \ No newline at end of file diff --git a/src/test_multiplex.c b/src/test_multiplex.c index 07dcbbc1aa..ba4e61b090 100644 --- a/src/test_multiplex.c +++ b/src/test_multiplex.c @@ -539,7 +539,7 @@ static int multiplexOpen( memset(pGroup, 0, sz); pMultiplexOpen->pGroup = pGroup; pGroup->bEnabled = (unsigned char)-1; - pGroup->bTruncate = sqlite3_uri_boolean(zUri, "truncate", + pGroup->bTruncate = (unsigned char)sqlite3_uri_boolean(zUri, "truncate", (flags & SQLITE_OPEN_MAIN_DB)==0); pGroup->szChunk = (int)sqlite3_uri_int64(zUri, "chunksize", SQLITE_MULTIPLEX_CHUNK_SIZE); @@ -978,7 +978,7 @@ static int multiplexFileControl(sqlite3_file *pConn, int op, void *pArg){ case MULTIPLEX_CTRL_ENABLE: if( pArg ) { int bEnabled = *(int *)pArg; - pGroup->bEnabled = bEnabled; + pGroup->bEnabled = (unsigned char)bEnabled; rc = SQLITE_OK; } break; diff --git a/src/test_onefile.c b/src/test_onefile.c index 122be700e6..46c8bc9c83 100644 --- a/src/test_onefile.c +++ b/src/test_onefile.c @@ -508,7 +508,7 @@ static int fsSync(sqlite3_file *pFile, int flags){ if( p->eType==DATABASE_FILE ){ unsigned char zSize[4]; zSize[0] = (pReal->nDatabase&0xFF000000)>>24; - zSize[1] = (pReal->nDatabase&0x00FF0000)>>16; + zSize[1] = (unsigned char)((pReal->nDatabase&0x00FF0000)>>16); zSize[2] = (pReal->nDatabase&0x0000FF00)>>8; zSize[3] = (pReal->nDatabase&0x000000FF); rc = pRealFile->pMethods->xWrite(pRealFile, zSize, 4, 0); diff --git a/src/test_osinst.c b/src/test_osinst.c index 4ae23a87c6..e51ce77ef8 100644 --- a/src/test_osinst.c +++ b/src/test_osinst.c @@ -644,9 +644,9 @@ static void vfslog_flush(VfslogVfs *p){ static void put32bits(unsigned char *p, unsigned int v){ p[0] = v>>24; - p[1] = v>>16; - p[2] = v>>8; - p[3] = v; + p[1] = (unsigned char)(v>>16); + p[2] = (unsigned char)(v>>8); + p[3] = (unsigned char)v; } static void vfslog_call( diff --git a/tool/logest.c b/tool/logest.c index 347fa68a4f..e936e02cbe 100644 --- a/tool/logest.c +++ b/tool/logest.c @@ -147,7 +147,7 @@ int main(int argc, char **argv){ }else if( strcmp(z,"inv")==0 ){ if( n>0 ) a[n-1] = -a[n-1]; }else if( z[0]=='^' ){ - a[n++] = atoi(z+1); + a[n++] = (LogEst)atoi(z+1); }else if( isInteger(z) ){ a[n++] = logEstFromInteger(atoi(z)); }else if( isFloat(z) && z[0]!='-' ){ diff --git a/tool/showdb.c b/tool/showdb.c index 06cd36cd2c..d51a2fd83d 100644 --- a/tool/showdb.c +++ b/tool/showdb.c @@ -151,7 +151,7 @@ static unsigned char *fileRead(sqlite3_int64 ofst, int nByte){ exit(1); } }else{ - lseek(g.dbfd, ofst, SEEK_SET); + lseek(g.dbfd, (long)ofst, SEEK_SET); got = read(g.dbfd, aData, nByte); if( got>0 && got Date: Tue, 12 Apr 2016 20:15:12 +0000 Subject: [PATCH 10/12] Even more compiler warning fixes. FossilOrigin-Name: 7faec9ea335c53953338886398b85aef87348a1c --- ext/session/test_session.c | 5 ++--- manifest | 17 +++++++---------- manifest.uuid | 2 +- src/tclsqlite.c | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ext/session/test_session.c b/ext/session/test_session.c index 15f7b6f575..1aa63b74ed 100644 --- a/ext/session/test_session.c +++ b/ext/session/test_session.c @@ -314,7 +314,8 @@ static void test_append_value(Tcl_Obj *pList, sqlite3_value *pVal){ pObj = Tcl_NewStringObj(z, n); break; } - case SQLITE_BLOB: + default: + assert( sqlite3_value_type(pVal)==SQLITE_BLOB ); Tcl_ListObjAppendElement(0, pList, Tcl_NewStringObj("b", 1)); pObj = Tcl_NewByteArrayObj( sqlite3_value_blob(pVal), @@ -871,7 +872,6 @@ static int test_sqlite3session_foreach( pOld = Tcl_NewObj(); if( op!=SQLITE_INSERT ){ - int i; for(i=0; ipWalHook; if( choice==DB_UPDATE_HOOK ) ppHook = &pDb->pUpdateHook; if( choice==DB_ROLLBACK_HOOK ) ppHook = &pDb->pRollbackHook; From 02d436b1f62cdf2a9d52f492f37315af3a60a59a Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 12 Apr 2016 20:26:51 +0000 Subject: [PATCH 11/12] A couple more compiler warning fixes. FossilOrigin-Name: 929fa4c31e7c5b8c6cbb1412478ea91b15ad5529 --- ext/session/sqlite3session.c | 7 +++---- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c index 62a502ed0a..b058d357e2 100644 --- a/ext/session/sqlite3session.c +++ b/ext/session/sqlite3session.c @@ -1593,9 +1593,9 @@ static void sessionDeleteTable(SessionTable *pList){ pNext = pTab->pNext; for(i=0; inChange; i++){ SessionChange *p; - SessionChange *pNext; - for(p=pTab->apChange[i]; p; p=pNext){ - pNext = p->pNext; + SessionChange *pNextChange; + for(p=pTab->apChange[i]; p; p=pNextChange){ + pNextChange = p->pNext; sqlite3_free(p); } } @@ -2882,7 +2882,6 @@ static int sessionChangesetNext( ** modified fields are present in the new.* record. The old.* record ** is currently completely empty. This block shifts the PK fields from ** new.* to old.*, to accommodate the code that reads these arrays. */ - int i; for(i=0; inCol; i++){ assert( p->apValue[i]==0 ); assert( p->abPK[i]==0 || p->apValue[i+p->nCol] ); diff --git a/manifest b/manifest index f9632eb6dc..779f6d2d85 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Even\smore\scompiler\swarning\sfixes. -D 2016-04-12T20:15:12.629 +C A\scouple\smore\scompiler\swarning\sfixes. +D 2016-04-12T20:26:51.392 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -291,7 +291,7 @@ F ext/session/sessionG.test 01ef705096a9d3984eebdcca79807a211dee1b60 F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596 F ext/session/sessionfault.test d52cbb7bee48cc8ee80335e07eb72fcb6b15eb40 F ext/session/sessionfault2.test ac1dfd77a0fb0ea310aee40a16645ef1b66d3f88 -F ext/session/sqlite3session.c 7cd68ba5ecd42b67f81b35e1b745377b930321dc +F ext/session/sqlite3session.c beb300cd1b5c5054062c8e6e807b10475e363410 F ext/session/sqlite3session.h 64e9e7f185725ef43b97f4a9a0c0df0669844f1d F ext/session/test_session.c 464f2c8bf502795d95969387eb8e93f68c513c15 F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P ab69527c1608da0b668f3b49e967661dd99cc3d4 -R 20e961c07d1c1c471c08312c9c1778dd +P 7faec9ea335c53953338886398b85aef87348a1c +R 87aeb18b7b49f1214878481261210b19 U mistachkin -Z 5d6bc734cb4437d7a6fe4e81cf260e24 +Z a8f0651fba3c604b158b208be423d211 diff --git a/manifest.uuid b/manifest.uuid index 73e8c38367..99bf9a8c26 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7faec9ea335c53953338886398b85aef87348a1c \ No newline at end of file +929fa4c31e7c5b8c6cbb1412478ea91b15ad5529 \ No newline at end of file From 4926fec967841ca7bea32447a14e29a057cb90a4 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 13 Apr 2016 15:33:42 +0000 Subject: [PATCH 12/12] Add the --indent option to the .schema and .fullschema commands in the shell, to enable simple but effective pretty-printing. FossilOrigin-Name: 83cfe82cd6d31ec0a6193525fd92e63a2a43b142 --- manifest | 16 +++---- manifest.uuid | 2 +- src/shell.c | 109 +++++++++++++++++++++++++++++++++++++++++------ test/shell1.test | 2 +- 4 files changed, 106 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index ef6f2bcf49..fd372f61ab 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Compilation\sfix\sfor\sa\sC99-ism\sin\sthe\s'fts3view'\stool. -D 2016-04-12T19:30:31.230 +C Add\sthe\s--indent\soption\sto\sthe\s.schema\sand\s.fullschema\scommands\sin\sthe\sshell,\nto\senable\ssimple\sbut\seffective\spretty-printing. +D 2016-04-13T15:33:42.000 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -376,7 +376,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20 F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e F src/select.c a07e6022e2b559f3c2ec80442472c5965fa7a3fc -F src/shell.c b7922fa264f8c8d72a5ec6dd0b091e15a93c4de5 +F src/shell.c aeaab68456010319cb71406cbaca05865b295154 F src/sqlite.h.in 64eb70a3b309751bebf73a5552a51244f68f0ea5 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2 @@ -1051,7 +1051,7 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5 F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 -F test/shell1.test b3df199cef9bc722d4078c893a7093d31174ea11 +F test/shell1.test 023657b3f8ba108dbd5ff2ebc8fceb3cf6d4ff9f F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b F test/shell3.test da513d522ef6f01cee8475dcf8332bff8982b3dd F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a18a6ce2271865d04cd75a8a5baa63798b7393db -R d725baf71b4a1cdc4415395863dd2840 -U mistachkin -Z 4008d4d2d72bf9083c3fc9e1b20a35f7 +P bedb88a4b9c808ea781ae69058399a1a3a3d15fa +R 3c29e35f34f5f72131dcf42e4c969859 +U drh +Z 8b78abfa618f6bd7144123bc68122527 diff --git a/manifest.uuid b/manifest.uuid index 42ae789fd7..37449ab981 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bedb88a4b9c808ea781ae69058399a1a3a3d15fa \ No newline at end of file +83cfe82cd6d31ec0a6193525fd92e63a2a43b142 \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 001dd6d465..33010e5ff1 100644 --- a/src/shell.c +++ b/src/shell.c @@ -669,6 +669,7 @@ struct ShellState { #define MODE_Csv 7 /* Quote strings, numbers are plain */ #define MODE_Explain 8 /* Like MODE_Column, but do not truncate data */ #define MODE_Ascii 9 /* Use ASCII unit and record separators (0x1F/0x1E) */ +#define MODE_Pretty 10 /* Pretty-print schemas */ static const char *modeDescr[] = { "line", @@ -681,6 +682,7 @@ static const char *modeDescr[] = { "csv", "explain", "ascii", + "prettyprint", }; /* @@ -1054,7 +1056,71 @@ static int shell_callback( } break; } - case MODE_Semi: + case MODE_Semi: { /* .schema and .fullschema output */ + utf8_printf(p->out, "%s;\n", azArg[0]); + break; + } + case MODE_Pretty: { /* .schema and .fullschema with --indent */ + char *z; + int i,j; + int nParen = 0; + char cEnd = 0; + char c; + int nLine = 0; + assert( nArg==1 ); + if( azArg[0]==0 ) break; + if( sqlite3_strlike("CREATE VIEW%", azArg[0], 0)==0 + || sqlite3_strlike("CREATE TRIG%", azArg[0], 0)==0 + ){ + utf8_printf(p->out, "%s;\n", azArg[0]); + break; + } + z = sqlite3_mprintf("%s", azArg[0]); + j = 0; + for(i=0; IsSpace(z[i]); i++){} + for(; (c = z[i])!=0; i++){ + if( IsSpace(c) ){ + if( IsSpace(z[j-1]) || z[j-1]=='(' ) continue; + }else if( (c=='(' || c==')') && j>0 && IsSpace(z[j-1]) ){ + j--; + } + z[j++] = c; + } + while( j>0 && IsSpace(z[j-1]) ){ j--; } + z[j] = 0; + if( strlen30(z)>=79 ){ + for(i=j=0; z[i]; i++){ + char c = z[i]; + if( c==cEnd ){ + cEnd = 0; + }else if( c=='"' || c=='\'' || c=='`' ){ + cEnd = c; + }else if( c=='[' ){ + cEnd = ']'; + }else if( c=='(' ){ + nParen++; + }else if( c==')' ){ + nParen--; + if( nLine>0 && nParen==0 && j>0 ){ + utf8_printf(p->out, "%.*s\n", j, z); + j = 0; + } + } + z[j++] = c; + if( nParen==1 && (c=='(' || c==',' || c=='\n') ){ + if( c=='\n' ) j--; + utf8_printf(p->out, "%.*s\n ", j, z); + j = 0; + nLine++; + while( IsSpace(z[i+1]) ){ i++; } + } + } + z[j] = 0; + } + utf8_printf(p->out, "%s;\n", z); + sqlite3_free(z); + break; + } case MODE_List: { if( p->cnt++==0 && p->showHeader ){ for(i=0; iout, "%s", z); if( iout, "%s", p->colSeparator); - }else if( p->cMode==MODE_Semi ){ - utf8_printf(p->out, ";%s", p->rowSeparator); }else{ utf8_printf(p->out, "%s", p->rowSeparator); } @@ -2024,7 +2088,7 @@ static char zHelp[] = ".eqp on|off Enable or disable automatic EXPLAIN QUERY PLAN\n" ".exit Exit this program\n" ".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n" - ".fullschema Show schema and the content of sqlite_stat tables\n" + ".fullschema ?--indent? Show schema and the content of sqlite_stat tables\n" ".headers on|off Turn display of headers on or off\n" ".help Show this message\n" ".import FILE TABLE Import data from FILE into TABLE\n" @@ -2060,9 +2124,8 @@ static char zHelp[] = ".restore ?DB? FILE Restore content of DB (default \"main\") from FILE\n" ".save FILE Write in-memory database into FILE\n" ".scanstats on|off Turn sqlite3_stmt_scanstatus() metrics on or off\n" - ".schema ?TABLE? Show the CREATE statements\n" - " If TABLE specified, only show tables matching\n" - " LIKE pattern TABLE.\n" + ".schema ?PATTERN? Show the CREATE statements matching PATTERN\n" + " Add --indent for pretty-printing\n" ".separator COL ?ROW? Change the column separator and optionally the row\n" " separator for both the output mode and .import\n" #if defined(SQLITE_ENABLE_SESSION) @@ -2933,6 +2996,17 @@ static int shellNomemError(void){ return 1; } +/* +** Compare the string as a command-line option with either one or two +** initial "-" characters. +*/ +static int optionMatch(const char *zStr, const char *zOpt){ + if( zStr[0]!='-' ) return 0; + zStr++; + if( zStr[0]=='-' ) zStr++; + return strcmp(zStr, zOpt)==0; +} + /* ** If an input line begins with "." then invoke this routine to ** process that line. @@ -3219,15 +3293,19 @@ static int do_meta_command(char *zLine, ShellState *p){ ShellState data; char *zErrMsg = 0; int doStats = 0; + memcpy(&data, p, sizeof(data)); + data.showHeader = 0; + data.cMode = data.mode = MODE_Semi; + if( nArg==2 && optionMatch(azArg[1], "indent") ){ + data.cMode = data.mode = MODE_Pretty; + nArg = 1; + } if( nArg!=1 ){ - raw_printf(stderr, "Usage: .fullschema\n"); + raw_printf(stderr, "Usage: .fullschema ?--indent?\n"); rc = 1; goto meta_command_exit; } open_db(p, 0); - memcpy(&data, p, sizeof(data)); - data.showHeader = 0; - data.cMode = data.mode = MODE_Semi; rc = sqlite3_exec(p->db, "SELECT sql FROM" " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x" @@ -3862,7 +3940,12 @@ static int do_meta_command(char *zLine, ShellState *p){ memcpy(&data, p, sizeof(data)); data.showHeader = 0; data.cMode = data.mode = MODE_Semi; - if( nArg==2 ){ + if( nArg>=2 && optionMatch(azArg[1], "indent") ){ + data.cMode = data.mode = MODE_Pretty; + nArg--; + if( nArg==2 ) azArg[1] = azArg[2]; + } + if( nArg==2 && azArg[1][0]!='-' ){ int i; for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]); if( strcmp(azArg[1],"sqlite_master")==0 ){ @@ -3917,7 +4000,7 @@ static int do_meta_command(char *zLine, ShellState *p){ callback, &data, &zErrMsg ); }else{ - raw_printf(stderr, "Usage: .schema ?LIKE-PATTERN?\n"); + raw_printf(stderr, "Usage: .schema ?--indent? ?LIKE-PATTERN?\n"); rc = 1; goto meta_command_exit; } diff --git a/test/shell1.test b/test/shell1.test index 9dd0f42093..760c85fadc 100644 --- a/test/shell1.test +++ b/test/shell1.test @@ -568,7 +568,7 @@ do_test shell1-3.21.2 { do_test shell1-3.21.3 { # too many arguments catchcmd "test.db" ".schema FOO BAD" -} {1 {Usage: .schema ?LIKE-PATTERN?}} +} {1 {Usage: .schema ?--indent? ?LIKE-PATTERN?}} do_test shell1-3.21.4 { catchcmd "test.db" {