Skip to content

Commit 39a3668

Browse files
committed
replace sqlite3_profile with sqlite3_trace_v2
1 parent fbb0f43 commit 39a3668

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/crypto_impl.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,16 +1598,17 @@ int sqlcipher_codec_add_random(codec_ctx *ctx, const char *zRight, int random_sz
15981598
return SQLITE_ERROR;
15991599
}
16001600

1601-
#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_DEPRECATED)
1602-
static void sqlcipher_profile_callback(void *file, const char *sql, sqlite3_uint64 run_time){
1603-
FILE *f = (FILE*)file;
1604-
double elapsed = run_time/1000000.0;
1605-
if(f) fprintf(f, "Elapsed time:%.3f ms - %s\n", elapsed, sql);
1601+
#if !defined(SQLITE_OMIT_TRACE)
1602+
static int sqlcipher_profile_callback(unsigned int trace, void *file, void *stmt, void *run_time){
1603+
FILE *f = (FILE*) file;
1604+
double elapsed = (*((sqlite3_uint64*)run_time))/1000000.0;
1605+
if(f) fprintf(f, "Elapsed time:%.3f ms - %s\n", elapsed, sqlite3_sql((sqlite3_stmt*)stmt));
1606+
return SQLITE_OK;
16061607
}
16071608
#endif
16081609

16091610
int sqlcipher_cipher_profile(sqlite3 *db, const char *destination){
1610-
#if defined(SQLITE_OMIT_TRACE) || defined(SQLITE_OMIT_DEPRECATED)
1611+
#if defined(SQLITE_OMIT_TRACE)
16111612
return SQLITE_ERROR;
16121613
#else
16131614
FILE *f;
@@ -1624,7 +1625,7 @@ int sqlcipher_cipher_profile(sqlite3 *db, const char *destination){
16241625
if((f = fopen(destination, "a")) == 0) return SQLITE_ERROR;
16251626
#endif
16261627
}
1627-
sqlite3_profile(db, sqlcipher_profile_callback, f);
1628+
sqlite3_trace_v2(db, SQLITE_TRACE_PROFILE, sqlcipher_profile_callback, f);
16281629
return SQLITE_OK;
16291630
#endif
16301631
}

0 commit comments

Comments
 (0)