Remove unused parameter from function rtreeInit() (part of the r-tree extension)...

FossilOrigin-Name: 3224ea59812d0f3b5685bd92751054b81e3b681e

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index b41816917b0633b23a540e2d560f2db22911cc5f..14796c685631e3b8710c43002f61283b03d967c7 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -12,7 +12,7 @@
 ** This file contains code for implementations of the r-tree and r*-tree
 ** algorithms packaged as an SQLite virtual table module.
 **
-** $Id: rtree.c,v 1.9 2008/09/08 11:07:03 danielk1977 Exp $
+** $Id: rtree.c,v 1.10 2008/10/25 17:10:10 danielk1977 Exp $
 */
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
@@ -600,7 +600,7 @@ static void nodeGetCell(
 ** the virtual table module xCreate() and xConnect() methods.
 */
 static int rtreeInit(
-  sqlite3 *, void *, int, const char *const*, sqlite3_vtab **, char **, int, int
+  sqlite3 *, void *, int, const char *const*, sqlite3_vtab **, char **, int
 );
 
 /* 
@@ -613,7 +613,7 @@ static int rtreeCreate(
   sqlite3_vtab **ppVtab,
   char **pzErr
 ){
-  return rtreeInit(db, pAux, argc, argv, ppVtab, pzErr, 1, (int)pAux);
+  return rtreeInit(db, pAux, argc, argv, ppVtab, pzErr, 1);
 }
 
 /* 
@@ -626,7 +626,7 @@ static int rtreeConnect(
   sqlite3_vtab **ppVtab,
   char **pzErr
 ){
-  return rtreeInit(db, pAux, argc, argv, ppVtab, pzErr, 0, (int)pAux);
+  return rtreeInit(db, pAux, argc, argv, ppVtab, pzErr, 0);
 }
 
 /*
@@ -2651,18 +2651,18 @@ static int getPageSize(sqlite3 *db, const char *zDb, int *piPageSize){
 */
 static int rtreeInit(
   sqlite3 *db,                        /* Database connection */
-  void *pAux,                         /* Pointer to head of rtree list */
+  void *pAux,                         /* One of the RTREE_COORD_* constants */
   int argc, const char *const*argv,   /* Parameters to CREATE TABLE statement */
   sqlite3_vtab **ppVtab,              /* OUT: New virtual table */
   char **pzErr,                       /* OUT: Error message, if any */
-  int isCreate,                       /* True for xCreate, false for xConnect */
-  int eCoordType                      /* One of the RTREE_COORD_* constants */
+  int isCreate                        /* True for xCreate, false for xConnect */
 ){
   int rc = SQLITE_OK;
   int iPageSize = 0;
   Rtree *pRtree;
   int nDb;              /* Length of string argv[1] */
   int nName;            /* Length of string argv[2] */
+  int eCoordType = (int)pAux;
 
   const char *aErrMsg[] = {
     0,                                                    /* 0 */

diff --git a/manifest b/manifest
index d722932f33c5c56c10813c5f5067928310a4acc7..7dd3f770160f975b4bc4f5600b63e36278c9788d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\sresult-set\salias\scache\swhen\son\sconditional\scode\sbranches.\nTicket\s#3461.\s\sThe\scolumn\scache\sand\sresult\sset\salias\scache\smechanisms\sare\nprone\sto\sthis\skind\sof\serror\sand\sneed\sto\sbe\srefactored.\s\sThis\scheck-in\sshould\nbe\sconsidered\sa\stemporary\sfix\sin\sadvance\sof\sa\smore\sgeneral\sredesign\sof\sthe\nwhole\smechanism.\s(CVS\s5841)
-D 2008-10-25T15:03:21
+C Remove\sunused\sparameter\sfrom\sfunction\srtreeInit()\s(part\sof\sthe\sr-tree\sextension).\s(CVS\s5842)
+D 2008-10-25T17:10:10
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 3fe17eccd87d385b5adc9766828716cfdd154d6b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -65,7 +65,7 @@ F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
 F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 9a9ef98ea5c36841cedf95d8cfbe79ebb411fef6
+F ext/rtree/rtree.c 250b7209e992b8663b67336a4bb1c39f2199eab7
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 620223886bf1a319317e63235aac20790375c544
 F ext/rtree/rtree2.test 9ac9d28fa948779df66916c67a5dcf9704c3cb74
@@ -651,7 +651,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P f2cc159159278201809022706c28bc53b6c3c859
-R 834f8fa8222ec3788eea3c5c99405941
-U drh
-Z cdbf7fca1951d2efcea11548a6916305
+P 1fa3bbd8220ce073e91935ea362b6f5d5d6d2859
+R dae93994bda0f30e07a5f49b4bf52661
+U danielk1977
+Z 7aae3acdac273e44b3563e1dd3d963ab

diff --git a/manifest.uuid b/manifest.uuid
index 969cef1b94cf8a4265a847f30cc4abad23f7b518..8b87b3000d9b9fde8c99aeffc4f467f60c23c4d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fa3bbd8220ce073e91935ea362b6f5d5d6d2859
\ No newline at end of file
+3224ea59812d0f3b5685bd92751054b81e3b681e
\ No newline at end of file