Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ccan/ccan/json_out/json_out.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct json_out {
/* Callback if we reallocate. */
void (*move_cb)(struct json_out *jout, ptrdiff_t delta, void *arg);
void *cb_arg;

#ifdef CCAN_JSON_OUT_DEBUG
/* tal_arr of types ( or [ we're enclosed in. NULL if oom. */
char *wrapping;
Expand Down Expand Up @@ -246,7 +246,7 @@ bool json_out_addv(struct json_out *jout,
dst = mkroom(jout, fmtlen + 1 + (int)quote*2);
if (!dst)
goto out;
vsprintf(dst + quote, fmt, ap2);
vsnprintf(dst + quote, fmtlen + 1, fmt, ap2);
}

#ifdef CCAN_JSON_OUT_DEBUG
Expand Down
2 changes: 1 addition & 1 deletion common/test/run-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
int main(int argx, char *argv[])
{
/* Just some context objects to hang spans off of. */
int a, b, c, d;
int a = 0, b = 0, c = 0, d = 0;

common_setup(argv[0]);

Expand Down
6 changes: 3 additions & 3 deletions devtools/mkquery.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ int main(int argc, char *argv[])
{
struct bitcoin_blkid chainhash;
const tal_t *ctx = tal(NULL, char);
const u8 *msg;
const u8 *msg = NULL;

setup_locale();
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY |
Expand All @@ -36,7 +36,7 @@ int main(int argc, char *argv[])
strtol(argv[3], NULL, 0),
strtol(argv[4], NULL, 0));
} else if (streq(argv[1], "query_channel_range")) {
struct tlv_query_channel_range_tlvs *tlvs;
struct tlv_query_channel_range_tlvs *tlvs = NULL;
if (argc == 5)
tlvs = NULL;
else if (argc == 6) {
Expand All @@ -50,7 +50,7 @@ int main(int argc, char *argv[])
strtol(argv[4], NULL, 0),
tlvs);
} else if (streq(argv[1], "query_short_channel_ids")) {
struct tlv_query_short_channel_ids_tlvs *tlvs;
struct tlv_query_short_channel_ids_tlvs *tlvs = NULL;
u8 *encoded;

if (argc == 4)
Expand Down
2 changes: 1 addition & 1 deletion lightningd/dual_open_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -2254,7 +2254,7 @@ static bool verify_option_will_fund_signature(struct peer *peer,
static void handle_validate_lease(struct subd *dualopend,
const u8 *msg)
{
const secp256k1_ecdsa_signature sig;
secp256k1_ecdsa_signature sig = {{0}};
u16 chan_fee_max_ppt;
u32 chan_fee_max_base_msat, lease_expiry;
struct pubkey their_pubkey;
Expand Down
3 changes: 1 addition & 2 deletions openingd/dualopend.c
Original file line number Diff line number Diff line change
Expand Up @@ -2794,7 +2794,6 @@ static u8 *opener_commits(struct state *state,
struct amount_sat total,
char **err_reason)
{
struct channel_id cid;
struct amount_msat our_msats;
struct penalty_base *pbase;
struct bitcoin_tx *local_commit;
Expand Down Expand Up @@ -2853,7 +2852,7 @@ static u8 *opener_commits(struct state *state,

tal_free(state->channel);
state->channel = new_initial_channel(state,
&cid,
&state->channel_id,
&tx_state->funding,
state->minimum_depth,
take(new_height_states(NULL, LOCAL,
Expand Down
Loading