From 489f1e86e3ad5dcf7e2a84c472c752d52355a8f9 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 25 Nov 2015 18:40:38 +0000 Subject: [PATCH] Fix harmless compiler warnings in test_fs.c. Fix typos and clean up the text of the documentation for sqlite3_strglob() and sqlite3_strlike(). FossilOrigin-Name: 697b20534c2d780cdd8cc165d2930f6e56480770 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/sqlite.h.in | 28 +++++++++++++--------------- src/test_fs.c | 3 +-- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/manifest b/manifest index 4c40672e14..3eb5cb0f1a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\stest_fs.c\sto\sinclude\sa\svirtual\stable\sthat\sreads\sa\sfile-system\shierarchy.\sUse\sit\sto\sfurther\stest\sGLOB\sand\sLIKE\ssupport\sfor\svirtual\stables. -D 2015-11-25T18:07:46.837 +C Fix\sharmless\scompiler\swarnings\sin\stest_fs.c.\s\sFix\stypos\sand\sclean\sup\sthe\stext\nof\sthe\sdocumentation\sfor\ssqlite3_strglob()\sand\ssqlite3_strlike(). +D 2015-11-25T18:40:38.741 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc e928e68168df69b353300ac87c10105206653a03 @@ -341,7 +341,7 @@ F src/resolve.c f4c897ca76ca6d5e0b3f0499c627392ffe657c8e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c e10586c750d87211caa8f4b239e2bfa6a2049e5b F src/shell.c f0f59ea60ad297f671b7ae0fb957a736ad17c92c -F src/sqlite.h.in cbe8643b6a1c7313bf6447a2aa7abdb31c73dd77 +F src/sqlite.h.in 1340aa105f53fbc6fd5b9918b54b64c64e910ee7 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 41ef50b0418a7c5ad1337bb80db5a7928dee764f F src/sqliteInt.h 64256d193a16a147d9f6317cc4e095fdd3e0a2e9 @@ -366,7 +366,7 @@ F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f F src/test_config.c f2824de39f59d8d621e2d6ec5cc67006d000b2eb F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc -F src/test_fs.c 802b1863c77f0531603c4a70f30ac5bca89a60da +F src/test_fs.c 9a56a587ce1db424af430d5ff650b5736b498238 F src/test_func.c 0d9c25956152adefee8881c6fadc8354793764d0 F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32 @@ -1405,7 +1405,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 191aef986ffc4ef34d813e417e52a4ec820b0300 -R 98283e54084b319f4a987e20b98e348d -U dan -Z 4eb24c0ce56061f040de45e89ced3c69 +P 6ef6578c03b7cfbeaaf3627b9eea2febf501ace5 +R 6a7e3073277459e34ef3bc33d986fb8e +U drh +Z 86f0abe6c80c8309344887b29ae04a0c diff --git a/manifest.uuid b/manifest.uuid index 44129864bc..c10a55b520 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6ef6578c03b7cfbeaaf3627b9eea2febf501ace5 \ No newline at end of file +697b20534c2d780cdd8cc165d2930f6e56480770 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index b93ff5873e..d340c05bf9 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -7368,42 +7368,40 @@ int sqlite3_strnicmp(const char *, const char *, int); /* ** CAPI3REF: String Globbing * -** ^The [sqlite3_strglob(P,X)] interface returns zero if string X matches -** the glob pattern P, and it returns non-zero if string X does not match -** the glob pattern P. ^The definition of glob pattern matching used in +** ^The [sqlite3_strglob(P,X)] interface returns zero if and only if +** string X matches the [GLOB] pattern P. +** ^The definition of [GLOB] pattern matching used in ** [sqlite3_strglob(P,X)] is the same as for the "X GLOB P" operator in the -** SQL dialect used by SQLite. ^The sqlite3_strglob(P,X) function is case -** sensitive. +** SQL dialect understood by SQLite. ^The [sqlite3_strglob(P,X)] function +** is case sensitive. ** ** Note that this routine returns zero on a match and non-zero if the strings ** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()]. ** -** See also: sqlite3_strlike(). +** See also: [sqlite3_strlike()]. */ int sqlite3_strglob(const char *zGlob, const char *zStr); /* ** CAPI3REF: String LIKE Matching * -** ^The [sqlite3_strlike(P,X,E)] interface returns zero if string X matches -** the LIKE pattern P with escape character E, and it returns non-zero if -** string X does not match the like pattern. -** ^The definition of LIKE pattern matching used in +** ^The [sqlite3_strlike(P,X,E)] interface returns zero if and only if +** string X matches the [LIKE] pattern P with escape character E. +** ^The definition of [LIKE] pattern matching used in ** [sqlite3_strlike(P,X,E)] is the same as for the "X LIKE P ESCAPE E" -** operator in the SQL dialect used by SQLite. ^For "X LIKE P" without +** operator in the SQL dialect understood by SQLite. ^For "X LIKE P" without ** the ESCAPE clause, set the E parameter of [sqlite3_strlike(P,X,E)] to 0. -** ^As with the LIKE operator, the [sqlite3_str(P,X,E)] function is case +** ^As with the LIKE operator, the [sqlite3_strlike(P,X,E)] function is case ** insensitive - equivalent upper and lower case ASCII characters match ** one another. ** ** ^The [sqlite3_strlike(P,X,E)] function matches Unicode characters, though -** only ASCII characters are case folded. (This is because when SQLite was -** first written, the case folding rules for Unicode where still in flux.) +** only ASCII characters are case folded. ** ** Note that this routine returns zero on a match and non-zero if the strings ** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()]. ** -** See also: sqlite3_strglob(). +** See also: [sqlite3_strglob()]. */ int sqlite3_strlike(const char *zGlob, const char *zStr, unsigned int cEsc); diff --git a/src/test_fs.c b/src/test_fs.c index eab5a4a7ad..213b65689a 100644 --- a/src/test_fs.c +++ b/src/test_fs.c @@ -241,7 +241,6 @@ static int fsdirFilter( int argc, sqlite3_value **argv ){ FsdirCsr *pCsr = (FsdirCsr*)pVtabCursor; - int rc; const char *zDir; int nDir; @@ -443,7 +442,7 @@ static int fstreeNext(sqlite3_vtab_cursor *cur){ pCsr->pStmt = 0; }else{ rc = SQLITE_OK; - pCsr->fd = open(sqlite3_column_text(pCsr->pStmt, 0), O_RDONLY); + pCsr->fd = open((const char*)sqlite3_column_text(pCsr->pStmt, 0), O_RDONLY); } return rc; -- 2.47.2