db: db_set_intvar/db_get_var should take a const char *.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ElementsProject · Mar 27, 2023 · 2be271d · 2be271d
1 parent 8b4a26f
commit 2be271d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 23 deletions.
diff --git a/db/exec.c b/db/exec.c
@@ -58,7 +58,7 @@ u32 db_data_version_get(struct db *db)
 	return version;
 }
 
-void db_set_intvar(struct db *db, char *varname, s64 val)
+void db_set_intvar(struct db *db, const char *varname, s64 val)
 {
 	size_t changes;
 	struct db_stmt *stmt = db_prepare_v2(db, SQL("UPDATE vars SET intval=? WHERE name=?;"));
@@ -77,7 +77,7 @@ void db_set_intvar(struct db *db, char *varname, s64 val)
 	}
 }
 
-s64 db_get_intvar(struct db *db, char *varname, s64 defval)
+s64 db_get_intvar(struct db *db, const char *varname, s64 defval)
 {
 	s64 res = defval;
 	struct db_stmt *stmt = db_prepare_v2(

diff --git a/db/exec.h b/db/exec.h
@@ -13,15 +13,15 @@ struct db;
  * Utility function to store generic integer values in the
  * database.
  */
-void db_set_intvar(struct db *db, char *varname, s64 val);
+void db_set_intvar(struct db *db, const char *varname, s64 val);
 
 /**
  * db_get_intvar - Retrieve an integer variable from the database
  *
  * Either returns the value in the database, or @defval if
  * the query failed or no such variable exists.
  */
-s64 db_get_intvar(struct db *db, char *varname, s64 defval);
+s64 db_get_intvar(struct db *db, const char *varname, s64 defval);
 
 /* Get the current data version (entries). */
 u32 db_data_version_get(struct db *db);

diff --git a/gossipd/test/run-check_channel_announcement.c b/gossipd/test/run-check_channel_announcement.c
@@ -86,14 +86,6 @@ const u8 *gossip_store_get_private_update(const tal_t *ctx UNNEEDED,
 void gossip_store_mark_channel_deleted(struct gossip_store *gs UNNEEDED,
 				       const struct short_channel_id *scid UNNEEDED)
 { fprintf(stderr, "gossip_store_mark_channel_deleted called!\n"); abort(); }
-/* Generated stub for gossip_store_mark_channel_zombie */
-void gossip_store_mark_channel_zombie(struct gossip_store *gs UNNEEDED,
-				      struct broadcastable *bcast UNNEEDED)
-{ fprintf(stderr, "gossip_store_mark_channel_zombie called!\n"); abort(); }
-/* Generated stub for gossip_store_mark_cupdate_zombie */
-void gossip_store_mark_cupdate_zombie(struct gossip_store *gs UNNEEDED,
-				      struct broadcastable *bcast UNNEEDED)
-{ fprintf(stderr, "gossip_store_mark_cupdate_zombie called!\n"); abort(); }
 /* Generated stub for gossip_store_new */
 struct gossip_store *gossip_store_new(struct routing_state *rstate UNNEEDED,
 				      struct list_head *peers UNNEEDED)

diff --git a/gossipd/test/run-txout_failure.c b/gossipd/test/run-txout_failure.c
@@ -57,14 +57,6 @@ const u8 *gossip_store_get_private_update(const tal_t *ctx UNNEEDED,
 void gossip_store_mark_channel_deleted(struct gossip_store *gs UNNEEDED,
 				       const struct short_channel_id *scid UNNEEDED)
 { fprintf(stderr, "gossip_store_mark_channel_deleted called!\n"); abort(); }
-/* Generated stub for gossip_store_mark_channel_zombie */
-void gossip_store_mark_channel_zombie(struct gossip_store *gs UNNEEDED,
-				      struct broadcastable *bcast UNNEEDED)
-{ fprintf(stderr, "gossip_store_mark_channel_zombie called!\n"); abort(); }
-/* Generated stub for gossip_store_mark_cupdate_zombie */
-void gossip_store_mark_cupdate_zombie(struct gossip_store *gs UNNEEDED,
-				      struct broadcastable *bcast UNNEEDED)
-{ fprintf(stderr, "gossip_store_mark_cupdate_zombie called!\n"); abort(); }
 /* Generated stub for memleak_add_helper_ */
 void memleak_add_helper_(const tal_t *p UNNEEDED, void (*cb)(struct htable *memtable UNNEEDED,
 						    const tal_t *)){ }

diff --git a/lightningd/test/run-find_my_abspath.c b/lightningd/test/run-find_my_abspath.c
@@ -41,7 +41,7 @@ void db_begin_transaction_(struct db *db UNNEEDED, const char *location UNNEEDED
 void db_commit_transaction(struct db *db UNNEEDED)
 { fprintf(stderr, "db_commit_transaction called!\n"); abort(); }
 /* Generated stub for db_get_intvar */
-s64 db_get_intvar(struct db *db UNNEEDED, char *varname UNNEEDED, s64 defval UNNEEDED)
+s64 db_get_intvar(struct db *db UNNEEDED, const char *varname UNNEEDED, s64 defval UNNEEDED)
 { fprintf(stderr, "db_get_intvar called!\n"); abort(); }
 /* Generated stub for db_in_transaction */
 bool db_in_transaction(struct db *db UNNEEDED)

diff --git a/lightningd/test/run-invoice-select-inchan.c b/lightningd/test/run-invoice-select-inchan.c
@@ -14,8 +14,7 @@ struct channel *any_channel_by_scid(struct lightningd *ld UNNEEDED,
 				    bool privacy_leak_ok UNNEEDED)
 { fprintf(stderr, "any_channel_by_scid called!\n"); abort(); }
 /* Generated stub for bip32_pubkey */
-void bip32_pubkey(struct lightningd *ld UNNEEDED,
-		  struct pubkey *pubkey UNNEEDED, u32 index UNNEEDED)
+void bip32_pubkey(struct lightningd *ld UNNEEDED, struct pubkey *pubkey UNNEEDED, u32 index UNNEEDED)
 { fprintf(stderr, "bip32_pubkey called!\n"); abort(); }
 /* Generated stub for bitcoind_getutxout_ */
 void bitcoind_getutxout_(struct bitcoind *bitcoind UNNEEDED,