Remove redundant code

flo071 · Aug 2, 2018 · 0f7b11b · 0f7b11b
1 parent a623fd8
commit 0f7b11b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/connectd/connect.c b/connectd/connect.c
@@ -1393,7 +1393,6 @@ static void connect_failed(struct io_conn *conn, struct reaching *reach)
 				       retry_important, imp);
 	}
 	tal_free(reach);
-	return;
 }
 
 static struct io_plan *conn_init(struct io_conn *conn, struct reaching *reach)

diff --git a/devtools/print_wire.c b/devtools/print_wire.c
@@ -80,7 +80,6 @@ static void printwire_alias(const u8 **cursor, size_t *plen, size_t len)
 	if (!print_hexstring(cursor, plen, len))
 		return;
 	printf(" ]\n");
-	return;
 }
 
 static void printwire_addresses(const u8 **cursor, size_t *plen, size_t len)

diff --git a/wallet/wallet.c b/wallet/wallet.c
@@ -1316,7 +1316,7 @@ bool wallet_htlcs_load_for_channel(struct wallet *wallet,
 		return false;
 	}
 
-	while (ok && stmt && sqlite3_step(stmt) == SQLITE_ROW) {
+	while (ok && sqlite3_step(stmt) == SQLITE_ROW) {
 		struct htlc_in *in = tal(chan, struct htlc_in);
 		ok &= wallet_stmt2htlc_in(chan, stmt, in);
 		connect_htlc_in(htlcs_in, in);
@@ -1337,7 +1337,7 @@ bool wallet_htlcs_load_for_channel(struct wallet *wallet,
 		return false;
 	}
 
-	while (ok && stmt && sqlite3_step(stmt) == SQLITE_ROW) {
+	while (ok && sqlite3_step(stmt) == SQLITE_ROW) {
 		struct htlc_out *out = tal(chan, struct htlc_out);
 		ok &= wallet_stmt2htlc_out(chan, stmt, out);
 		connect_htlc_out(htlcs_out, out);
-Original file line number
+Diff line change
@@ Expand Up @@
     				       retry_important, imp);
     	}
     	tal_free(reach);
-    	return;
     }
     static struct io_plan *conn_init(struct io_conn *conn, struct reaching *reach)
@@ Expand Down @@