1
0
mirror of https://github.com/sqlite/sqlite.git synced 2026-01-06 08:01:16 +03:00

Do not use strcpy() in the (obsolete) amatch extension.

In releasetest.tcl, run Apple tests using -Os instead of -O1

FossilOrigin-Name: 4440e42031b9cb0edf9a8621cd4f46f209392940ec5b9eefcf8c1e3fef5f7b76
This commit is contained in:
drh
2017-05-23 19:35:20 +00:00
parent 1d1fc5e385
commit 92b71757f7
4 changed files with 9 additions and 15 deletions

View File

@@ -1001,7 +1001,6 @@ static void amatchWriteCost(amatch_word *pWord){
/* Circumvent compiler warnings about the use of strcpy() by supplying
** our own implementation.
*/
#if defined(__OpenBSD__)
static void amatchStrcpy(char *dest, const char *src){
while( (*(dest++) = *(src++))!=0 ){}
}
@@ -1009,11 +1008,6 @@ static void amatchStrcat(char *dest, const char *src){
while( *dest ) dest++;
amatchStrcpy(dest, src);
}
#else
# define amatchStrcpy strcpy
# define amatchStrcat strcat
#endif
/*
** Add a new amatch_word object to the queue.

View File

@@ -1,5 +1,5 @@
C Disable\sthe\sLEFT\sJOIN\sflattening\soptimization\sfor\saggregate\squeries,\sas\sit\ndoes\snot\scurrently\swork.\s\sFurther\sfix\sfor\sticket\s[cad1ab4cb7b0fc344].
D 2017-05-23T15:21:37.230
C Do\snot\suse\sstrcpy()\sin\sthe\s(obsolete)\samatch\sextension.\nIn\sreleasetest.tcl,\srun\sApple\stests\susing\s-Os\sinstead\sof\s-O1
D 2017-05-23T19:35:20.467
F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -209,7 +209,7 @@ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
F ext/icu/icu.c 84900472a088a3a172c6c079f58a1d3a1952c332
F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
F ext/misc/amatch.c 211108e201105e4bb0c076527b8cfd34330fc234
F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
F ext/misc/carray.c 40c27641010a4dc67e3690bdb7c9d36ca58b3c2d
F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
@@ -1060,7 +1060,7 @@ F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
F test/releasetest.tcl cb06c4df0de4872e65b178316f8a87ccf7624d59 x
F test/releasetest.tcl 89ab58d256371a652d1af11d3bf40a8b715b2d44aa0872c972efc60a70e43cf6 x
F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
@@ -1581,7 +1581,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 941d8142b7c9a96ff143d1add3c86cf42d61fd08e532d400dac555f23eadbcfb
R ffe4a77f21d90dd19d519ba4779a42b9
P 44b21e35c92137cc519d0cc87c627cc531d0bd442a7b9a7356fa2c6bc5f70fb6
R 4ca7afecfb1c0cffc4b794b8e7121808
U drh
Z e4d6716b4bf6ca92e150c31ad5fda640
Z 15ec40980fc747767cc1952ea17bf1e6

View File

@@ -1 +1 @@
44b21e35c92137cc519d0cc87c627cc531d0bd442a7b9a7356fa2c6bc5f70fb6
4440e42031b9cb0edf9a8621cd4f46f209392940ec5b9eefcf8c1e3fef5f7b76

View File

@@ -179,7 +179,7 @@ array set ::Configs [strip_comments {
-DSQLITE_ENABLE_LOCKING_STYLE=1
}
"Apple" {
-O1 # Avoid a compiler bug in gcc 4.2.1 build 5658
-Os
-DHAVE_GMTIME_R=1
-DHAVE_ISNAN=1
-DHAVE_LOCALTIME_R=1