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

tlvs: include correct reference for nested objects

Browse Source
This commit is contained in:
lisa neigut
2019-04-23 17:37:40 -07:00
committed by Christian Decker
parent 3028964687
commit 0ce287d52e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/generate-wire.py
View File

@@ -809,7 +809,8 @@ struct {struct_name} {{
elif f.is_len_var: elif f.is_len_var:
subcalls.append('towire_{}(p, {});'.format(basetype, f.name)) subcalls.append('towire_{}(p, {});'.format(basetype, f.name))
else: else:
subcalls.append('towire_{}(p, {}->{});'.format(basetype, self.name, f.name)) ref = '&' if f.fieldtype.needs_ptr() else ''
subcalls.append('towire_{}(p, {}{}->{});'.format(basetype, ref, self.name, f.name))
return tlv_message_towire_stub.format( return tlv_message_towire_stub.format(
tlv_name=tlv_name, tlv_name=tlv_name,
name=self.name, name=self.name,
@@ -865,8 +866,9 @@ struct {struct_name} {{
s = '{}->{} = fromwire_{}(cursor, plen);'.format( s = '{}->{} = fromwire_{}(cursor, plen);'.format(
self.name, f.name, basetype) self.name, f.name, basetype)
else: else:
s = 'fromwire_{}(cursor, plen, &{}->{});'.format( ref = '&' if f.fieldtype.needs_ptr() else ''
basetype, self.name, f.name) s = 'fromwire_{}(cursor, plen, {}{}->{});'.format(
basetype, ref, self.name, f.name)
subcalls.append(s) subcalls.append(s)
return fromwire_tlv_impl_templ.format( return fromwire_tlv_impl_templ.format(