diff options
author | drh <drh@noemail.net> | 2015-11-25 18:40:38 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-11-25 18:40:38 +0000 |
commit | 489f1e86e3ad5dcf7e2a84c472c752d52355a8f9 (patch) | |
tree | 59289698a62492cfa8996033a2df61971a1485c8 /src | |
parent | 1e93173ffcfbe2ebb4eae02622cd6e52c36a1729 (diff) | |
download | sqlite-489f1e86e3ad5dcf7e2a84c472c752d52355a8f9.tar.gz sqlite-489f1e86e3ad5dcf7e2a84c472c752d52355a8f9.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/sqlite.h.in | 28 | ||||
-rw-r--r-- | src/test_fs.c | 3 |
2 files changed, 14 insertions, 17 deletions
diff --git a/src/sqlite.h.in b/src/sqlite.h.in index b93ff5873..d340c05bf 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 eab5a4a7a..213b65689 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; |