status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up compiler warnings

This commit is contained in:
Nick Parker 2013-07-26 09:29:36 -05:00
parent fb14d957ca
commit b507d1b180
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto_impl.c
View File

@ -879,7 +879,7 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
Db *pDb = 0; Db *pDb = 0;
sqlite3 *db = ctx->pBt->db; sqlite3 *db = ctx->pBt->db;
const char *db_filename = sqlite3_db_filename(db, "main"); const char *db_filename = sqlite3_db_filename(db, "main");
const char *migrated_db_filename = sqlite3_mprintf("%s-migrated", db_filename); char *migrated_db_filename = sqlite3_mprintf("%s-migrated", db_filename);
char *key = ctx->read_ctx->pass; char *key = ctx->read_ctx->pass;
static const unsigned char aCopy[] = { static const unsigned char aCopy[] = {
BTREE_SCHEMA_VERSION, 1, /* Add one to the old schema cookie */ BTREE_SCHEMA_VERSION, 1, /* Add one to the old schema cookie */
@ -938,7 +938,7 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
assert( 1==sqlite3BtreeIsInTrans(pDest) ); assert( 1==sqlite3BtreeIsInTrans(pDest) );
assert( 1==sqlite3BtreeIsInTrans(pSrc) ); assert( 1==sqlite3BtreeIsInTrans(pSrc) );
sqlite3CodecGetKey(db, db->nDb - 1, &key, &password_sz); sqlite3CodecGetKey(db, db->nDb - 1, (void**)&key, &password_sz);
sqlcipher_codec_ctx_set_pass(ctx, key, password_sz, 2); sqlcipher_codec_ctx_set_pass(ctx, key, password_sz, 2);
int i = 0; int i = 0;