Fossil SCM

Update SQLite to the 3.8.8 release.

drh 2015-01-16 13:28 trunk
Commit 3d8bf07d13f1ec9dbdb79da4484c642dc8d31d28
Parent 7ad592b915316cb…
2 files changed +6 -8 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+6 -8
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -278,11 +278,11 @@
278278
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
279279
 ** [sqlite_version()] and [sqlite_source_id()].
280280
 */
281281
 #define SQLITE_VERSION "3.8.8"
282282
 #define SQLITE_VERSION_NUMBER 3008008
283
-#define SQLITE_SOURCE_ID "2015-01-12 21:43:00 e693e11d1b9265974c32bddba873ea30a4d0b708"
283
+#define SQLITE_SOURCE_ID "2015-01-16 12:08:06 7d68a42face3ab14ed88407d4331872f5b243fdf"
284284
285285
 /*
286286
 ** CAPI3REF: Run-Time Library Version Numbers
287287
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
288288
 **
@@ -149454,17 +149454,16 @@
149454149454
 */
149455149455
 static int readInt16(u8 *p){
149456149456
 return (p[0]<<8) + p[1];
149457149457
 }
149458149458
 static void readCoord(u8 *p, RtreeCoord *pCoord){
149459
- u32 i = (
149459
+ pCoord->u = (
149460149460
 (((u32)p[0]) << 24) +
149461149461
 (((u32)p[1]) << 16) +
149462149462
 (((u32)p[2]) << 8) +
149463149463
 (((u32)p[3]) << 0)
149464149464
 );
149465
- *(u32 *)pCoord = i;
149466149465
 }
149467149466
 static i64 readInt64(u8 *p){
149468149467
 return (
149469149468
 (((i64)p[0]) << 56) +
149470149469
 (((i64)p[1]) << 48) +
@@ -149489,11 +149488,11 @@
149489149488
 }
149490149489
 static int writeCoord(u8 *p, RtreeCoord *pCoord){
149491149490
 u32 i;
149492149491
 assert( sizeof(RtreeCoord)==4 );
149493149492
 assert( sizeof(u32)==4 );
149494
- i = *(u32 *)pCoord;
149493
+ i = pCoord->u;
149495149494
 p[0] = (i>>24)&0xFF;
149496149495
 p[1] = (i>>16)&0xFF;
149497149496
 p[2] = (i>> 8)&0xFF;
149498149497
 p[3] = (i>> 0)&0xFF;
149499149498
 return 4;
@@ -149820,18 +149819,17 @@
149820149819
 RtreeNode *pNode, /* The node containing the cell to be read */
149821149820
 int iCell, /* Index of the cell within the node */
149822149821
 RtreeCell *pCell /* OUT: Write the cell contents here */
149823149822
 ){
149824149823
 u8 *pData;
149825
- u8 *pEnd;
149826149824
 RtreeCoord *pCoord;
149825
+ int ii;
149827149826
 pCell->iRowid = nodeGetRowid(pRtree, pNode, iCell);
149828149827
 pData = pNode->zData + (12 + pRtree->nBytesPerCell*iCell);
149829
- pEnd = pData + pRtree->nDim*8;
149830149828
 pCoord = pCell->aCoord;
149831
- for(; pData<pEnd; pData+=4, pCoord++){
149832
- readCoord(pData, pCoord);
149829
+ for(ii=0; ii<pRtree->nDim*2; ii++){
149830
+ readCoord(&pData[ii*4], &pCoord[ii]);
149833149831
 }
149834149832
 }
149835149833
149836149834
149837149835
 /* Forward declaration for the function that does the work of
149838149836
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -278,11 +278,11 @@
278 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
279 ** [sqlite_version()] and [sqlite_source_id()].
280 */
281 #define SQLITE_VERSION "3.8.8"
282 #define SQLITE_VERSION_NUMBER 3008008
283 #define SQLITE_SOURCE_ID "2015-01-12 21:43:00 e693e11d1b9265974c32bddba873ea30a4d0b708"
284
285 /*
286 ** CAPI3REF: Run-Time Library Version Numbers
287 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
288 **
@@ -149454,17 +149454,16 @@
149454 */
149455 static int readInt16(u8 *p){
149456 return (p[0]<<8) + p[1];
149457 }
149458 static void readCoord(u8 *p, RtreeCoord *pCoord){
149459 u32 i = (
149460 (((u32)p[0]) << 24) +
149461 (((u32)p[1]) << 16) +
149462 (((u32)p[2]) << 8) +
149463 (((u32)p[3]) << 0)
149464 );
149465 *(u32 *)pCoord = i;
149466 }
149467 static i64 readInt64(u8 *p){
149468 return (
149469 (((i64)p[0]) << 56) +
149470 (((i64)p[1]) << 48) +
@@ -149489,11 +149488,11 @@
149489 }
149490 static int writeCoord(u8 *p, RtreeCoord *pCoord){
149491 u32 i;
149492 assert( sizeof(RtreeCoord)==4 );
149493 assert( sizeof(u32)==4 );
149494 i = *(u32 *)pCoord;
149495 p[0] = (i>>24)&0xFF;
149496 p[1] = (i>>16)&0xFF;
149497 p[2] = (i>> 8)&0xFF;
149498 p[3] = (i>> 0)&0xFF;
149499 return 4;
@@ -149820,18 +149819,17 @@
149820 RtreeNode *pNode, /* The node containing the cell to be read */
149821 int iCell, /* Index of the cell within the node */
149822 RtreeCell *pCell /* OUT: Write the cell contents here */
149823 ){
149824 u8 *pData;
149825 u8 *pEnd;
149826 RtreeCoord *pCoord;
 
149827 pCell->iRowid = nodeGetRowid(pRtree, pNode, iCell);
149828 pData = pNode->zData + (12 + pRtree->nBytesPerCell*iCell);
149829 pEnd = pData + pRtree->nDim*8;
149830 pCoord = pCell->aCoord;
149831 for(; pData<pEnd; pData+=4, pCoord++){
149832 readCoord(pData, pCoord);
149833 }
149834 }
149835
149836
149837 /* Forward declaration for the function that does the work of
149838
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -278,11 +278,11 @@
278 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
279 ** [sqlite_version()] and [sqlite_source_id()].
280 */
281 #define SQLITE_VERSION "3.8.8"
282 #define SQLITE_VERSION_NUMBER 3008008
283 #define SQLITE_SOURCE_ID "2015-01-16 12:08:06 7d68a42face3ab14ed88407d4331872f5b243fdf"
284
285 /*
286 ** CAPI3REF: Run-Time Library Version Numbers
287 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
288 **
@@ -149454,17 +149454,16 @@
149454 */
149455 static int readInt16(u8 *p){
149456 return (p[0]<<8) + p[1];
149457 }
149458 static void readCoord(u8 *p, RtreeCoord *pCoord){
149459 pCoord->u = (
149460 (((u32)p[0]) << 24) +
149461 (((u32)p[1]) << 16) +
149462 (((u32)p[2]) << 8) +
149463 (((u32)p[3]) << 0)
149464 );
 
149465 }
149466 static i64 readInt64(u8 *p){
149467 return (
149468 (((i64)p[0]) << 56) +
149469 (((i64)p[1]) << 48) +
@@ -149489,11 +149488,11 @@
149488 }
149489 static int writeCoord(u8 *p, RtreeCoord *pCoord){
149490 u32 i;
149491 assert( sizeof(RtreeCoord)==4 );
149492 assert( sizeof(u32)==4 );
149493 i = pCoord->u;
149494 p[0] = (i>>24)&0xFF;
149495 p[1] = (i>>16)&0xFF;
149496 p[2] = (i>> 8)&0xFF;
149497 p[3] = (i>> 0)&0xFF;
149498 return 4;
@@ -149820,18 +149819,17 @@
149819 RtreeNode *pNode, /* The node containing the cell to be read */
149820 int iCell, /* Index of the cell within the node */
149821 RtreeCell *pCell /* OUT: Write the cell contents here */
149822 ){
149823 u8 *pData;
 
149824 RtreeCoord *pCoord;
149825 int ii;
149826 pCell->iRowid = nodeGetRowid(pRtree, pNode, iCell);
149827 pData = pNode->zData + (12 + pRtree->nBytesPerCell*iCell);
 
149828 pCoord = pCell->aCoord;
149829 for(ii=0; ii<pRtree->nDim*2; ii++){
149830 readCoord(&pData[ii*4], &pCoord[ii]);
149831 }
149832 }
149833
149834
149835 /* Forward declaration for the function that does the work of
149836
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.8.8"
111111
 #define SQLITE_VERSION_NUMBER 3008008
112
-#define SQLITE_SOURCE_ID "2015-01-12 21:43:00 e693e11d1b9265974c32bddba873ea30a4d0b708"
112
+#define SQLITE_SOURCE_ID "2015-01-16 12:08:06 7d68a42face3ab14ed88407d4331872f5b243fdf"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.8"
111 #define SQLITE_VERSION_NUMBER 3008008
112 #define SQLITE_SOURCE_ID "2015-01-12 21:43:00 e693e11d1b9265974c32bddba873ea30a4d0b708"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.8"
111 #define SQLITE_VERSION_NUMBER 3008008
112 #define SQLITE_SOURCE_ID "2015-01-16 12:08:06 7d68a42face3ab14ed88407d4331872f5b243fdf"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button