From 3f343b283ba2da41533835a14323d2d5f0d05062 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Fri, 3 Jan 2025 08:41:13 -0500 Subject: [PATCH] ssb: Delete one more redundant global setting accessor. --- src/ssb.rpc.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/src/ssb.rpc.c b/src/ssb.rpc.c index efa52869..0857b19b 100644 --- a/src/ssb.rpc.c +++ b/src/ssb.rpc.c @@ -20,30 +20,6 @@ static void _tf_ssb_rpc_send_peers_exchange(tf_ssb_connection_t* connection); static void _tf_ssb_rpc_start_delete_blobs(tf_ssb_t* ssb, int delay_ms); static void _tf_ssb_rpc_start_delete_feeds(tf_ssb_t* ssb, int delay_ms); -static bool _get_global_setting_bool(tf_ssb_t* ssb, const char* name, bool default_value) -{ - bool result = default_value; - sqlite3* db = tf_ssb_acquire_db_reader(ssb); - sqlite3_stmt* statement; - if (sqlite3_prepare(db, "SELECT json_extract(value, '$.' || ?) FROM properties WHERE id = 'core' AND key = 'settings'", -1, &statement, NULL) == SQLITE_OK) - { - if (sqlite3_bind_text(statement, 1, name, -1, NULL) == SQLITE_OK) - { - if (sqlite3_step(statement) == SQLITE_ROW) - { - result = sqlite3_column_int(statement, 0) != 0; - } - } - sqlite3_finalize(statement); - } - else - { - tf_printf("prepare failed: %s\n", sqlite3_errmsg(db)); - } - tf_ssb_release_db_reader(ssb, db); - return result; -} - static void _tf_ssb_rpc_gossip_ping_callback( tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data) { @@ -1469,13 +1445,16 @@ static void _tf_ssb_rpc_start_delete_blobs(tf_ssb_t* ssb, int delay_ms) static void _tf_ssb_rpc_delete_feeds_work(tf_ssb_t* ssb, void* user_data) { delete_t* delete = user_data; - if (!_get_global_setting_bool(ssb, "delete_stale_feeds", false)) + sqlite3* db = tf_ssb_acquire_db_reader(ssb); + bool delete_stale_feeds = false; + tf_ssb_db_get_global_setting_bool(db, "delete_stale_feeds", &delete_stale_feeds); + if (!delete_stale_feeds) { + tf_ssb_release_db_reader(ssb, db); return; } int64_t start_ns = uv_hrtime(); int64_t replication_hops = 2; - sqlite3* db = tf_ssb_acquire_db_reader(ssb); tf_ssb_db_get_global_setting_int64(db, "replication_hops", &replication_hops); tf_ssb_release_db_reader(ssb, db); const char** identities = tf_ssb_db_get_all_visible_identities(ssb, replication_hops);