Fossil SCM
Rename new function for clarity and consistency.
Commit
d6422ab0f0a31a2a23ab5b4e72b68e408ce63729544ad3ca37bd75c6a655bd12
Parent
95f14fae0044fcb…
1 file changed
+2
-2
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1043,11 +1043,11 @@ | ||
| 1043 | 1043 | |
| 1044 | 1044 | |
| 1045 | 1045 | /* |
| 1046 | 1046 | ** Sets the encryption key for the database, if necessary. |
| 1047 | 1047 | */ |
| 1048 | -void db_set_key(sqlite3 *db, const char *zDbName){ | |
| 1048 | +void db_maybe_set_encryption_key(sqlite3 *db, const char *zDbName){ | |
| 1049 | 1049 | Blob key; |
| 1050 | 1050 | blob_init(&key, 0, 0); |
| 1051 | 1051 | db_maybe_obtain_encryption_key(zDbName, &key); |
| 1052 | 1052 | if( blob_size(&key)>0 ){ |
| 1053 | 1053 | char *zCmd = sqlite3_mprintf("PRAGMA key(%Q)", blob_str(&key)); |
| @@ -1073,11 +1073,11 @@ | ||
| 1073 | 1073 | g.zVfsName |
| 1074 | 1074 | ); |
| 1075 | 1075 | if( rc!=SQLITE_OK ){ |
| 1076 | 1076 | db_err("[%s]: %s", zDbName, sqlite3_errmsg(db)); |
| 1077 | 1077 | } |
| 1078 | - db_set_key(db, zDbName); | |
| 1078 | + db_maybe_set_encryption_key(db, zDbName); | |
| 1079 | 1079 | sqlite3_busy_timeout(db, 5000); |
| 1080 | 1080 | sqlite3_wal_autocheckpoint(db, 1); /* Set to checkpoint frequently */ |
| 1081 | 1081 | sqlite3_create_function(db, "user", 0, SQLITE_UTF8, 0, db_sql_user, 0, 0); |
| 1082 | 1082 | sqlite3_create_function(db, "cgi", 1, SQLITE_UTF8, 0, db_sql_cgi, 0, 0); |
| 1083 | 1083 | sqlite3_create_function(db, "cgi", 2, SQLITE_UTF8, 0, db_sql_cgi, 0, 0); |
| 1084 | 1084 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1043,11 +1043,11 @@ | |
| 1043 | |
| 1044 | |
| 1045 | /* |
| 1046 | ** Sets the encryption key for the database, if necessary. |
| 1047 | */ |
| 1048 | void db_set_key(sqlite3 *db, const char *zDbName){ |
| 1049 | Blob key; |
| 1050 | blob_init(&key, 0, 0); |
| 1051 | db_maybe_obtain_encryption_key(zDbName, &key); |
| 1052 | if( blob_size(&key)>0 ){ |
| 1053 | char *zCmd = sqlite3_mprintf("PRAGMA key(%Q)", blob_str(&key)); |
| @@ -1073,11 +1073,11 @@ | |
| 1073 | g.zVfsName |
| 1074 | ); |
| 1075 | if( rc!=SQLITE_OK ){ |
| 1076 | db_err("[%s]: %s", zDbName, sqlite3_errmsg(db)); |
| 1077 | } |
| 1078 | db_set_key(db, zDbName); |
| 1079 | sqlite3_busy_timeout(db, 5000); |
| 1080 | sqlite3_wal_autocheckpoint(db, 1); /* Set to checkpoint frequently */ |
| 1081 | sqlite3_create_function(db, "user", 0, SQLITE_UTF8, 0, db_sql_user, 0, 0); |
| 1082 | sqlite3_create_function(db, "cgi", 1, SQLITE_UTF8, 0, db_sql_cgi, 0, 0); |
| 1083 | sqlite3_create_function(db, "cgi", 2, SQLITE_UTF8, 0, db_sql_cgi, 0, 0); |
| 1084 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1043,11 +1043,11 @@ | |
| 1043 | |
| 1044 | |
| 1045 | /* |
| 1046 | ** Sets the encryption key for the database, if necessary. |
| 1047 | */ |
| 1048 | void db_maybe_set_encryption_key(sqlite3 *db, const char *zDbName){ |
| 1049 | Blob key; |
| 1050 | blob_init(&key, 0, 0); |
| 1051 | db_maybe_obtain_encryption_key(zDbName, &key); |
| 1052 | if( blob_size(&key)>0 ){ |
| 1053 | char *zCmd = sqlite3_mprintf("PRAGMA key(%Q)", blob_str(&key)); |
| @@ -1073,11 +1073,11 @@ | |
| 1073 | g.zVfsName |
| 1074 | ); |
| 1075 | if( rc!=SQLITE_OK ){ |
| 1076 | db_err("[%s]: %s", zDbName, sqlite3_errmsg(db)); |
| 1077 | } |
| 1078 | db_maybe_set_encryption_key(db, zDbName); |
| 1079 | sqlite3_busy_timeout(db, 5000); |
| 1080 | sqlite3_wal_autocheckpoint(db, 1); /* Set to checkpoint frequently */ |
| 1081 | sqlite3_create_function(db, "user", 0, SQLITE_UTF8, 0, db_sql_user, 0, 0); |
| 1082 | sqlite3_create_function(db, "cgi", 1, SQLITE_UTF8, 0, db_sql_cgi, 0, 0); |
| 1083 | sqlite3_create_function(db, "cgi", 2, SQLITE_UTF8, 0, db_sql_cgi, 0, 0); |
| 1084 |