/ Check-in [4edc5994]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix some typos in comments. No code changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4edc5994b26e1fd3245572cb80242d07ba20a475
User & Date: dan 2011-12-30 05:08:41
Context
2011-12-30
09:00
Change an implicit i64-to-int cast in pager.c to an explicit cast. check-in: 6a71ba9c user: dan tags: trunk
05:08
Fix some typos in comments. No code changes. check-in: 4edc5994 user: dan tags: trunk
2011-12-23
20:49
Documentation updates. No changes to code. check-in: a8a1a639 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os.c.

   137    137     const char *zPath, 
   138    138     sqlite3_file *pFile, 
   139    139     int flags, 
   140    140     int *pFlagsOut
   141    141   ){
   142    142     int rc;
   143    143     DO_OS_MALLOC_TEST(0);
   144         -  /* 0x87f3f is a mask of SQLITE_OPEN_ flags that are valid to be passed
          144  +  /* 0x87f7f is a mask of SQLITE_OPEN_ flags that are valid to be passed
   145    145     ** down into the VFS layer.  Some SQLITE_OPEN_ flags (for example,
   146    146     ** SQLITE_OPEN_FULLMUTEX or SQLITE_OPEN_SHAREDCACHE) are blocked before
   147    147     ** reaching the VFS. */
   148    148     rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x87f7f, pFlagsOut);
   149    149     assert( rc==SQLITE_OK || pFile->pMethods==0 );
   150    150     return rc;
   151    151   }

Changes to src/sqlite.h.in.

   362    362   
   363    363   /*
   364    364   ** CAPI3REF: Result Codes
   365    365   ** KEYWORDS: SQLITE_OK {error code} {error codes}
   366    366   ** KEYWORDS: {result code} {result codes}
   367    367   **
   368    368   ** Many SQLite functions return an integer result code from the set shown
   369         -** here in order to indicates success or failure.
          369  +** here in order to indicate success or failure.
   370    370   **
   371    371   ** New error codes may be added in future versions of SQLite.
   372    372   **
   373    373   ** See also: [SQLITE_IOERR_READ | extended result codes],
   374    374   ** [sqlite3_vtab_on_conflict()] [SQLITE_ROLLBACK | result codes].
   375    375   */
   376    376   #define SQLITE_OK           0   /* Successful result */
................................................................................
   740    740   ** VFSes do not need this signal and should silently ignore this opcode.
   741    741   ** Applications should not call [sqlite3_file_control()] with this
   742    742   ** opcode as doing so may disrupt the operation of the specialized VFSes
   743    743   ** that do require it.  
   744    744   **
   745    745   ** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
   746    746   ** retry counts and intervals for certain disk I/O operations for the
   747         -** windows [VFS] in order to work to provide robustness against
          747  +** windows [VFS] in order to provide robustness in the presence of
   748    748   ** anti-virus programs.  By default, the windows VFS will retry file read,
   749    749   ** file write, and file delete operations up to 10 times, with a delay
   750    750   ** of 25 milliseconds before the first retry and with the delay increasing
   751    751   ** by an additional 25 milliseconds with each subsequent retry.  This
   752         -** opcode allows those to values (10 retries and 25 milliseconds of delay)
          752  +** opcode allows these two values (10 retries and 25 milliseconds of delay)
   753    753   ** to be adjusted.  The values are changed for all database connections
   754    754   ** within the same process.  The argument is a pointer to an array of two
   755    755   ** integers where the first integer i the new retry count and the second
   756    756   ** integer is the delay.  If either integer is negative, then the setting
   757    757   ** is not changed but instead the prior value of that setting is written
   758    758   ** into the array entry, allowing the current retry settings to be
   759    759   ** interrogated.  The zDbName parameter is ignored.
................................................................................
  2011   2011   ** ^The sqlite3_vsnprintf() routine is a varargs version of sqlite3_snprintf().
  2012   2012   **
  2013   2013   ** These routines all implement some additional formatting
  2014   2014   ** options that are useful for constructing SQL statements.
  2015   2015   ** All of the usual printf() formatting options apply.  In addition, there
  2016   2016   ** is are "%q", "%Q", and "%z" options.
  2017   2017   **
  2018         -** ^(The %q option works like %s in that it substitutes a null-terminated
         2018  +** ^(The %q option works like %s in that it substitutes a nul-terminated
  2019   2019   ** string from the argument list.  But %q also doubles every '\'' character.
  2020   2020   ** %q is designed for use inside a string literal.)^  By doubling each '\''
  2021   2021   ** character it escapes that character and allows it to be inserted into
  2022   2022   ** the string.
  2023   2023   **
  2024   2024   ** For example, assume the string variable zText contains text as follows:
  2025   2025   **
................................................................................
  3531   3531   ** ^The values returned by [sqlite3_column_bytes()] and 
  3532   3532   ** [sqlite3_column_bytes16()] do not include the zero terminators at the end
  3533   3533   ** of the string.  ^For clarity: the values returned by
  3534   3534   ** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
  3535   3535   ** bytes in the string, not the number of characters.
  3536   3536   **
  3537   3537   ** ^Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
  3538         -** even empty strings, are always zero terminated.  ^The return
         3538  +** even empty strings, are always zero-terminated.  ^The return
  3539   3539   ** value from sqlite3_column_blob() for a zero-length BLOB is a NULL pointer.
  3540   3540   **
  3541   3541   ** ^The object returned by [sqlite3_column_value()] is an
  3542   3542   ** [unprotected sqlite3_value] object.  An unprotected sqlite3_value object
  3543   3543   ** may only be used with [sqlite3_bind_value()] and [sqlite3_result_value()].
  3544   3544   ** If the [unprotected sqlite3_value] object returned by
  3545   3545   ** [sqlite3_column_value()] is used in any other way, including calls
................................................................................
  5592   5592   ** with the SQLITE_DEBUG flag.  ^External mutex implementations
  5593   5593   ** are only required to provide these routines if SQLITE_DEBUG is
  5594   5594   ** defined and if NDEBUG is not defined.
  5595   5595   **
  5596   5596   ** ^These routines should return true if the mutex in their argument
  5597   5597   ** is held or not held, respectively, by the calling thread.
  5598   5598   **
  5599         -** ^The implementation is not required to provided versions of these
         5599  +** ^The implementation is not required to provide versions of these
  5600   5600   ** routines that actually work. If the implementation does not provide working
  5601   5601   ** versions of these routines, it should at least provide stubs that always
  5602   5602   ** return true so that one does not get spurious assertion failures.
  5603   5603   **
  5604   5604   ** ^If the argument to sqlite3_mutex_held() is a NULL pointer then
  5605   5605   ** the routine should return 1.   This seems counter-intuitive since
  5606   5606   ** clearly the mutex cannot be held if it does not exist.  But