Adjust db_index search count and rename codec_pragma

developernotes · developernotes · commit 1ba0e0e418cd · 2013-08-30T08:24:57.000-05:00
diff --git a/src/crypto.c b/src/crypto.c
@@ -78,7 +78,7 @@ static int codec_set_pass_key(sqlite3* db, int nDb, const void *zKey, int nKey,
   return SQLITE_ERROR;
 } 
 
-int codec_pragma(sqlite3* db, int iDb, Parse *pParse, const char *zLeft, const char *zRight) {
+int sqlcipher_codec_pragma(sqlite3* db, int iDb, Parse *pParse, const char *zLeft, const char *zRight) {
   struct Db *pDb = &db->aDb[iDb];
   codec_ctx *ctx = NULL;
   int rc;
@@ -87,8 +87,8 @@ int codec_pragma(sqlite3* db, int iDb, Parse *pParse, const char *zLeft, const c
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
   }
 
-  CODEC_TRACE(("codec_pragma: entered db=%p iDb=%d pParse=%p zLeft=%s zRight=%s ctx=%p\n", db, iDb, pParse, zLeft, zRight, ctx));
-
+  CODEC_TRACE(("sqlcipher_codec_pragma: entered db=%p iDb=%d pParse=%p zLeft=%s zRight=%s ctx=%p\n", db, iDb, pParse, zLeft, zRight, ctx));
+  
   if( sqlite3StrICmp(zLeft, "cipher_migrate")==0 && !zRight ){
     if(ctx){
       char *migrate_status = sqlite3_mprintf("%d", sqlcipher_codec_ctx_migrate(ctx));
@@ -341,12 +341,12 @@ void sqlite3_activate_see(const char* in) {
   /* do nothing, security enhancements are always active */
 }
 
-int sqlcipher_find_db_index(sqlite3 *db, const char *zDb) {
+static int sqlcipher_find_db_index(sqlite3 *db, const char *zDb) {
   if(zDb == NULL){
     return 0;
   }
   int db_index;
-  for(db_index = 0; db_index < db->nDb - 1; db_index++) {
+  for(db_index = 0; db_index < db->nDb; db_index++) {
     struct Db *pDb = &db->aDb[db_index];
     if(strcmp(pDb->zName, zDb) == 0) {
       return db_index;
diff --git a/src/pragma.c b/src/pragma.c
@@ -356,7 +356,7 @@ void sqlite3Pragma(
   Vdbe *v = sqlite3GetVdbe(pParse);  /* Prepared statement */
 /* BEGIN SQLCIPHER */
 #ifdef SQLITE_HAS_CODEC
-  extern int codec_pragma(sqlite3*, int, Parse *, const char *, const char *);
+  extern int sqlcipher_codec_pragma(sqlite3*, int, Parse *, const char *, const char *);
 #endif
 /* END SQLCIPHER */
 
@@ -422,8 +422,8 @@ void sqlite3Pragma(
                             
 /* BEGIN SQLCIPHER */
 #ifdef SQLITE_HAS_CODEC
-  if(codec_pragma(db, iDb, pParse, zLeft, zRight)) { 
-    /* codec_pragma executes internal */
+  if(sqlcipher_codec_pragma(db, iDb, pParse, zLeft, zRight)) { 
+    /* sqlcipher_codec_pragma executes internal */
   }else
   #endif
 /* END SQLCIPHER */
