diff --git a/doc/STYLE.md b/doc/STYLE.md index c473318cf..24a08ddcb 100644 --- a/doc/STYLE.md +++ b/doc/STYLE.md @@ -108,7 +108,7 @@ forget to set it on one path. `tal` and `tal_arr` to `talz` and `tal_arrz` for this reason, and initialize only the fields you expect to be used. -Similarly, you can use `memcheck(mem, len)` to explicity assert that +Similarly, you can use `memcheck(mem, len)` to explicitly assert that memory should have been initialized, rather than having valgrind trigger later. We use this when placing things on queues, for example. diff --git a/gossipd/gossip.c b/gossipd/gossip.c index f24058948..7c9c34b03 100644 --- a/gossipd/gossip.c +++ b/gossipd/gossip.c @@ -1044,7 +1044,7 @@ static struct io_plan *disconnect_peer(struct io_conn *conn, struct daemon *daem peer = find_peer(daemon, &id); if (peer && peer->local) { - /* This peer is local to this (gossipd) dameon */ + /* This peer is local to this (gossipd) daemon */ io_close(peer->local->conn); msg = towire_gossipctl_peer_disconnect_reply(NULL); daemon_conn_send(&daemon->master, take(msg)); diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 3c285203c..5826d77d3 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -622,7 +622,7 @@ static void gossipd_getpeers_complete(struct subd *gossip, const u8 *msg, } for (size_t i = 0; i < tal_count(nodes); i++) { - /* If no addresses, then this node announcement hasn't been recieved yet + /* If no addresses, then this node announcement hasn't been received yet * So no alias information either. */ if (nodes[i]->addresses != NULL && pubkey_eq(&nodes[i]->nodeid, &p->id)) { diff --git a/wallet/db.c b/wallet/db.c index 99beda9b1..577076eec 100644 --- a/wallet/db.c +++ b/wallet/db.c @@ -194,7 +194,7 @@ char *dbmigrations[] = { "CREATE INDEX channel_idx ON htlc_sigs (channelid)", /* Get rid of OPENINGD entries; we don't put them in db any more */ "DELETE FROM channels WHERE state=1", - /* Keep track of db ugprades, for debugging */ + /* Keep track of db upgrades, for debugging */ "CREATE TABLE db_upgrades (upgrade_from INTEGER, lightning_version TEXT);", /* We used not to clean up peers when their channels were gone. */ "DELETE FROM peers WHERE id NOT IN (SELECT peer_id FROM channels);", diff --git a/wallet/wallet.c b/wallet/wallet.c index 655cc4a34..d19bc18bc 100644 --- a/wallet/wallet.c +++ b/wallet/wallet.c @@ -1069,7 +1069,7 @@ int wallet_extract_owned_outputs(struct wallet *w, const struct bitcoin_tx *tx, * sure we actually track its * blockheight. This can happen when we grab * the output from a transaction we created - * outselves. */ + * ourselves. */ if (block) wallet_output_confirm(w, &utxo->txid, utxo->outnum, block->height); tal_free(utxo);