scottmac Thu Jul 31 00:46:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: MFH: Resync libsqlite files from amalgamation. Save the kittens, no EOL mess.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.1 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.2 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.1 Fri Jul 25 02:44:57 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu Jul 31 00:46:45 2008 @@ -41,7 +41,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -70,7 +70,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -436,7 +436,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -6061,7 +6061,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -6578,7 +6578,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -6797,7 +6797,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -7180,7 +7180,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _PAGER_H_ @@ -7603,7 +7603,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -9481,7 +9481,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -10971,7 +10971,7 @@ ** This file contains the C functions that implement a memory ** allocation subsystem for use by SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -11208,7 +11208,7 @@ ** This file contains the C functions that implement a memory ** allocation subsystem for use by SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -11699,7 +11699,7 @@ ** This version of the memory allocation subsystem is used if ** and only if SQLITE_MEMORY_SIZE is defined. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -12354,7 +12354,7 @@ ** This version of the memory allocation subsystem is used if ** and only if SQLITE_POW2_MEMORY_SIZE is defined. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -12866,7 +12866,7 @@ ** implementation is suitable for testing. ** debugging purposes ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifdef SQLITE_MUTEX_NOOP_DEBUG @@ -12986,7 +12986,7 @@ ************************************************************************* ** This file contains the C functions that implement mutexes for OS/2 ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -13234,7 +13234,7 @@ ************************************************************************* ** This file contains the C functions that implement mutexes for pthreads ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -13540,7 +13540,7 @@ ************************************************************************* ** This file contains the C functions that implement mutexes for win32 ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -13762,7 +13762,7 @@ ** Memory allocation functions used throughout sqlite. ** ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -14920,7 +14920,7 @@ ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -15042,7 +15042,7 @@ ** This file contains routines used to translate between UTF-8, ** UTF-16, UTF-16BE, and UTF-16LE. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** Notes on UTF-8: ** @@ -16021,7 +16021,7 @@ ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -16977,7 +16977,7 @@ ** This is the implementation of generic hash-tables ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* Turn bulk memory into a hash table object by initializing the @@ -23380,7 +23380,7 @@ ** start of a transaction, and is thus usually less than a few thousand, ** but can be as large as 2 billion for a really big database. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #define BITVEC_SZ 512 @@ -23693,7 +23693,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef SQLITE_OMIT_DISKIO @@ -29001,7 +29001,7 @@ ** ************************************************************************* ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** This file contains code used to implement mutexes on Btree objects. ** This code really belongs in btree.c. But btree.c is getting too @@ -29021,7 +29021,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to @@ -29963,7 +29963,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -38280,7 +38280,7 @@ ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -42034,7 +42034,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -46949,7 +46949,7 @@ ** ** This file contains code used to implement incremental BLOB I/O. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -47296,7 +47296,7 @@ ** ************************************************************************* ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifdef SQLITE_ENABLE_ATOMIC_WRITE @@ -47539,7 +47539,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -50996,7 +50996,7 @@ ** This file contains C code routines that used to generate VDBE code ** that implements the ALTER TABLE command. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -51626,7 +51626,7 @@ ************************************************************************* ** This file contains code associated with the ANALYZE command. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef SQLITE_OMIT_ANALYZE @@ -52053,7 +52053,7 @@ ************************************************************************* ** This file contains code used to implement the ATTACH and DETACH commands. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef SQLITE_OMIT_ATTACH @@ -52588,7 +52588,7 @@ ** systems that do not need this facility may omit it by recompiling ** the library with -DSQLITE_OMIT_AUTHORIZATION=1 ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -52832,7 +52832,7 @@ ** COMMIT ** ROLLBACK ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -56313,7 +56313,7 @@ ** This file contains functions used to access the internal hash tables ** of user defined functions and collation sequences. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -56692,7 +56692,7 @@ ** This file contains C code routines that are called by the parser ** in order to generate code for DELETE FROM statements. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -57242,7 +57242,7 @@ ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -58632,7 +58632,7 @@ ** This file contains C code routines that are called by the parser ** to handle INSERT statements in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -60307,7 +60307,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -60472,7 +60472,7 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. ** -** @(#) $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef _SQLITE3EXT_H_ #define _SQLITE3EXT_H_ @@ -61359,7 +61359,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* Ignore this whole file if pragmas are disabled @@ -62651,7 +62651,7 @@ ** interface, and routines that contribute to loading the database schema ** from disk. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -63455,7 +63455,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ @@ -68244,7 +68244,7 @@ ** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef SQLITE_OMIT_VIRTUALTABLE @@ -68926,7 +68926,7 @@ ** Most of the code in this file may be omitted by defining the ** SQLITE_OMIT_VACUUM macro. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH) @@ -69200,7 +69200,7 @@ ************************************************************************* ** This file contains code used to help implement virtual tables. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef SQLITE_OMIT_VIRTUALTABLE @@ -70033,7 +70033,7 @@ ** so is applicable. Because this module is responsible for selecting ** indices, you might also think of this module as the "query optimizer". ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -76147,7 +76147,7 @@ ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ /* @@ -76200,7 +76200,7 @@ ** ** The code in this file has been automatically generated by ** -** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ ** ** The code in this file implements a function that determines whether ** or not a given identifier is really an SQL keyword. The same thing @@ -76768,7 +76768,7 @@ ** separating it out, the code will be automatically omitted from ** static links that do not use it. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifndef SQLITE_OMIT_COMPLETE @@ -77039,7 +77039,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: sqlite3.c,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.2 2008/07/31 00:46:45 scottmac Exp $ */ #ifdef SQLITE_ENABLE_FTS3 /************** Include fts3.h in the middle of main.c ***********************/ http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.h?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.h diff -u php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.1 php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.2 --- php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.1 Fri Jul 25 02:44:58 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.h Thu Jul 31 00:46:46 2008 @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite3.h,v 1.1.2.1 2008/07/25 02:44:58 scottmac Exp $ +** @(#) $Id: sqlite3.h,v 1.1.2.2 2008/07/31 00:46:46 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3ext.h?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3ext.h diff -u php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.1.2.1 php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.1.2.2 --- php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.1.2.1 Fri Jul 25 02:44:58 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3ext.h Thu Jul 31 00:46:47 2008 @@ -15,7 +15,7 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. ** -** @(#) $Id: sqlite3ext.h,v 1.1.2.1 2008/07/25 02:44:58 scottmac Exp $ +** @(#) $Id: sqlite3ext.h,v 1.1.2.2 2008/07/31 00:46:47 scottmac Exp $ */ #ifndef _SQLITE3EXT_H_ #define _SQLITE3EXT_H_
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php