aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 00:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

db: use wrappers around boolean values.

Browse Source 
TRUE and FALSE according to sql2003 standard, 1 and 0 according to sqlite3.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-09-06 13:47:33 +09:30
parent 9d9ff00508
commit fcdb13093e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon/db.c
View File

@@ -70,6 +70,13 @@ static const char *sqlite3_column_str(sqlite3_stmt *stmt, int iCol)
#define TABLE(tablename, ...) \ #define TABLE(tablename, ...) \
"CREATE TABLE " #tablename " (" CPPMAGIC_JOIN(", ", __VA_ARGS__) ");" "CREATE TABLE " #tablename " (" CPPMAGIC_JOIN(", ", __VA_ARGS__) ");"
static const char *sql_bool(bool b)
{
/* SQL2003 says TRUE and FALSE are binary literal keywords.
* sqlite3 barfs. */
return (b) ? "1" : "0";
}
static char *PRINTF_FMT(3,4) static char *PRINTF_FMT(3,4)
db_exec(const tal_t *ctx, db_exec(const tal_t *ctx,
struct lightningd_state *dstate, const char *fmt, ...) struct lightningd_state *dstate, const char *fmt, ...)
@@ -1224,7 +1231,7 @@ bool db_set_anchor(struct peer *peer)
log_debug(peer->log, "%s(%s)", __func__, peerid); log_debug(peer->log, "%s(%s)", __func__, peerid);
errmsg = db_exec(ctx, peer->dstate, errmsg = db_exec(ctx, peer->dstate,
"INSERT INTO anchors VALUES (x'%s', x'%s', %u, %"PRIu64", %i, %u, %u);", "INSERT INTO anchors VALUES (x'%s', x'%s', %u, %"PRIu64", %i, %u, %s);",
peerid, peerid,
tal_hexstr(ctx, &peer->anchor.txid, tal_hexstr(ctx, &peer->anchor.txid,
sizeof(peer->anchor.txid)), sizeof(peer->anchor.txid)),
@@ -1232,7 +1239,7 @@ bool db_set_anchor(struct peer *peer)
peer->anchor.satoshis, peer->anchor.satoshis,
peer->anchor.ok_depth, peer->anchor.ok_depth,
peer->anchor.min_depth, peer->anchor.min_depth,
peer->anchor.ours); sql_bool(peer->anchor.ours));
if (errmsg) if (errmsg)
goto out; goto out;
@@ -1285,9 +1292,10 @@ bool db_set_visible_state(struct peer *peer)
} }
errmsg = db_exec(ctx, peer->dstate, errmsg = db_exec(ctx, peer->dstate,
"INSERT INTO their_visible_state VALUES (x'%s', %u, x'%s', x'%s', %u, %u, %"PRIu64", x'%s');", "INSERT INTO their_visible_state VALUES (x'%s', %s, x'%s', x'%s', %u, %u, %"PRIu64", x'%s');",
peerid, peerid,
peer->remote.offer_anchor == CMD_OPEN_WITH_ANCHOR, sql_bool(peer->remote.offer_anchor
== CMD_OPEN_WITH_ANCHOR),
pubkey_to_hexstr(ctx, peer->dstate->secpctx, pubkey_to_hexstr(ctx, peer->dstate->secpctx,
&peer->remote.commitkey), &peer->remote.commitkey),
pubkey_to_hexstr(ctx, peer->dstate->secpctx, pubkey_to_hexstr(ctx, peer->dstate->secpctx,
@@ -1344,10 +1352,10 @@ bool db_create_peer(struct peer *peer)
return false; return false;
} }
errmsg = db_exec(ctx, peer->dstate, errmsg = db_exec(ctx, peer->dstate,
"INSERT INTO peers VALUES (x'%s', '%s', %u, %"PRIi64");", "INSERT INTO peers VALUES (x'%s', '%s', %s, %"PRIi64");",
peerid, peerid,
state_name(peer->state), state_name(peer->state),
peer->local.offer_anchor == CMD_OPEN_WITH_ANCHOR, sql_bool(peer->local.offer_anchor == CMD_OPEN_WITH_ANCHOR),
peer->local.commit_fee_rate); peer->local.commit_fee_rate);
if (errmsg) if (errmsg)
goto out; goto out;