tools/generate-wire: don't use void * pointers for tlv fromwire.

And fix up the one place which got it wrong. Signed-off-by: Rusty Russell <[email protected]>
ZenGo-X · Dec 5, 2020 · dc83e64 · dc83e64
1 parent c5a2e64
commit dc83e64
Show file tree

Hide file tree

Showing 39 changed files with 59 additions and 68 deletions.
diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
diff --git a/devtools/blindedpath.c b/devtools/blindedpath.c
@@ -147,11 +147,12 @@ int main(int argc, char **argv)
 			u8 *p;
 			u8 buf[BIGSIZE_MAX_LEN];
 			const unsigned char npub[crypto_aead_chacha20poly1305_ietf_NPUBBYTES] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-			struct tlv_onionmsg_payload *inner, *outer;
+			struct tlv_onionmsg_payload *outer;
+			struct tlv_encmsg_tlvs *inner;
 			int ret;
 
 			/* Inner is encrypted */
-			inner = tlv_onionmsg_payload_new(tmpctx);
+			inner = tlv_encmsg_tlvs_new(tmpctx);
 			/* Use scid if they provided one */
 			if (scids[i]) {
 				inner->next_short_channel_id

diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
diff --git a/tools/gen/header_template b/tools/gen/header_template
@@ -104,7 +104,7 @@ bool fromwire_${tlv.name}(const u8 **cursor, size_t *max,
  * ensures that the resulting stream is valid according to
  * `${tlv.name}_is_valid`.
  */
-void towire_${tlv.name}(u8 **pptr, const void *record);
+void towire_${tlv.name}(u8 **pptr, const struct ${tlv.struct_name()} *record);
 
 /**
  * Check that the TLV stream is valid.

diff --git a/tools/gen/impl_template b/tools/gen/impl_template
@@ -257,8 +257,7 @@ ${static}const struct tlv_record_type tlvs_${tlv.name}[] = {
     % endfor
 };
 
-void towire_${tlv.name}(u8 **pptr,
-			const void *record)
+void towire_${tlv.name}(u8 **pptr, const struct ${tlv.struct_name()} *record)
 {
 	size_t num_types = ${len(tlv.messages)};
 	const struct tlv_record_type *types = tlvs_${tlv.name};

diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c