From: shane Date: Fri, 30 May 2008 15:35:30 +0000 (+0000) Subject: Fix typos in comments in sqlite.h.in. (CVS 5181) X-Git-Tag: version-3.6.10~996 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=236ce975fc70fd47bfec2b297c547370d05f8137;p=thirdparty%2Fsqlite.git Fix typos in comments in sqlite.h.in. (CVS 5181) FossilOrigin-Name: 47956f8ee997113a1765d27009504143e518cc69 --- diff --git a/manifest b/manifest index 4e4c262c0c..1b0ed34955 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stypos\sin\scomments\sin\swhere.c.\s(CVS\s5180) -D 2008-05-30T14:58:37 +C Fix\stypos\sin\scomments\sin\ssqlite.h.in.\s(CVS\s5181) +D 2008-05-30T15:35:31 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in ce92ea8dc7adfb743757794f51c10d1b0d9c55e4 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -142,7 +142,7 @@ F src/printf.c f2d4f6c5b0ec24b643e85fe60258adad8b1f6acc F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8 F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec -F src/sqlite.h.in bd32c7e159cf5f18f7de32d7e53a61e7218d4b53 +F src/sqlite.h.in 444181949a6cc3ec4e5f322adca0998a8da16cab F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3 F src/sqliteInt.h cfcb83222431108aa51565efecf3a084360ad4a6 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 @@ -591,7 +591,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c c65494ca99d1e09c246dfe37a7ca7a354af9990f -P 19f5f571dd09c91b6e6a3f82857f54bd30791c03 -R 370cbc62aa9ac62f8f836f2b7096e753 -U drh -Z 9dd2f30f46ebe42610e1e3f60bc2001b +P 7cadb223cb79387a7def7762dc9e42028d14baf3 +R bff31198d4ee51ff36b2f99acb782ff0 +U shane +Z 23685e4939f963ad7f8672f18f745279 diff --git a/manifest.uuid b/manifest.uuid index eea99179fb..41ad5ece26 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7cadb223cb79387a7def7762dc9e42028d14baf3 \ No newline at end of file +47956f8ee997113a1765d27009504143e518cc69 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 397b67ba47..15dec33715 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite.h.in,v 1.318 2008/05/23 17:21:09 shane Exp $ +** @(#) $Id: sqlite.h.in,v 1.319 2008/05/30 15:35:31 shane Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -367,7 +367,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); */ int sqlite3_exec( sqlite3*, /* An open database */ - const char *sql, /* SQL to be evaluted */ + const char *sql, /* SQL to be evaluated */ int (*callback)(void*,int,char**,char**), /* Callback function */ void *, /* 1st argument to callback */ char **errmsg /* Error msg written here */ @@ -1921,7 +1921,7 @@ void *sqlite3_profile(sqlite3*, ** [sqlite3_get_table()]. An example use for this ** interface is to keep a GUI updated during a large query. ** -** If the progress callback returns non-zero, the opertion is +** If the progress callback returns non-zero, the operation is ** interrupted. This feature can be used to implement a ** "Cancel" button on a GUI dialog box. ** @@ -2216,7 +2216,7 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** by untrusted external sources. An example application might be a ** webbrowser that has its own databases for storing history and ** separate databases controlled by JavaScript applications downloaded -** off the internet. The internal databases can be given the +** off the Internet. The internal databases can be given the ** large, default limits. Databases managed by external sources can ** be given much smaller limits designed to prevent a denial of service ** attach. Developers might also want to use the [sqlite3_set_authorizer()] @@ -3403,7 +3403,7 @@ sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol); ** [prepared statement]. If the virtual machine has not ** completed execution when this routine is called, that is like ** encountering an error or an interrupt. (See [sqlite3_interrupt()].) -** Incomplete updates may be rolled back and transactions cancelled, +** Incomplete updates may be rolled back and transactions canceled, ** depending on the circumstances, and the ** [error code] returned will be [SQLITE_ABORT]. ** @@ -4492,7 +4492,7 @@ sqlite3 *sqlite3_db_handle(sqlite3_stmt*); ** registered by prior calls. ** ** {F12954} If the F argument to [sqlite3_commit_hook(D,F,P)] is NULL -** then the commit hook callback is cancelled and no callback +** then the commit hook callback is canceled and no callback ** is invoked when a transaction commits. ** ** {F12955} If the commit callback returns non-zero then the commit is @@ -4511,7 +4511,7 @@ sqlite3 *sqlite3_db_handle(sqlite3_stmt*); ** registered by prior calls. ** ** {F12964} If the F argument to [sqlite3_rollback_hook(D,F,P)] is NULL -** then the rollback hook callback is cancelled and no callback +** then the rollback hook callback is canceled and no callback ** is invoked when a transaction rolls back. */ void *sqlite3_commit_hook(sqlite3*, int(*)(void*), void*);