Browse Source

align generate wire template

ppa-0.6.1
arowser 6 years ago
committed by Rusty Russell
parent
commit
85e02127a9
  1. 50
      tools/generate-wire.py

50
tools/generate-wire.py

@ -194,13 +194,13 @@ class Field(object):
fromwire_impl_templ = """bool fromwire_{name}({ctx}const void *p{args})
{{
{fields}
const u8 *cursor = p;
size_t plen = tal_len(p);
\tconst u8 *cursor = p;
\tsize_t plen = tal_len(p);
if (fromwire_u16(&cursor, &plen) != {enum.name})
return false;
\tif (fromwire_u16(&cursor, &plen) != {enum.name})
\t\treturn false;
{subcalls}
return cursor != NULL;
\treturn cursor != NULL;
}}
"""
@ -212,11 +212,11 @@ towire_header_templ = """u8 *towire_{name}(const tal_t *ctx{args});
towire_impl_templ = """u8 *towire_{name}(const tal_t *ctx{args})
{{
{field_decls}
u8 *p = tal_arr(ctx, u8, 0);
towire_u16(&p, {enumname});
\tu8 *p = tal_arr(ctx, u8, 0);
\ttowire_u16(&p, {enumname});
{subcalls}
return memcheck(p, tal_count(p));
\treturn memcheck(p, tal_count(p));
}}
"""
@ -224,17 +224,17 @@ printwire_header_templ = """void printwire_{name}(const u8 *cursor);
"""
printwire_impl_templ = """void printwire_{name}(const u8 *cursor)
{{
size_t plen = tal_len(cursor);
\tsize_t plen = tal_len(cursor);
if (fromwire_u16(&cursor, &plen) != {enum.name}) {{
printf("WRONG TYPE?!\\n");
return;
}}
\tif (fromwire_u16(&cursor, &plen) != {enum.name}) {{
\t\tprintf("WRONG TYPE?!\\n");
\t\treturn;
\t}}
{subcalls}
if (plen != 0)
printf("EXTRA: %s\\n", tal_hexstr(NULL, cursor, plen));
\tif (plen != 0)
\t\tprintf("EXTRA: %s\\n", tal_hexstr(NULL, cursor, plen));
}}
"""
@ -620,14 +620,14 @@ impl_template = """/* This file was generated by generate-wire.py */
const char *{enumname}_name(int e)
{{
static char invalidbuf[sizeof("INVALID ") + STR_MAX_CHARS(e)];
\tstatic char invalidbuf[sizeof("INVALID ") + STR_MAX_CHARS(e)];
switch ((enum {enumname})e) {{
{cases}
}}
\tswitch ((enum {enumname})e) {{
\t{cases}
\t}}
sprintf(invalidbuf, "INVALID %i", e);
return invalidbuf;
\tsprintf(invalidbuf, "INVALID %i", e);
\treturn invalidbuf;
}}
{func_decls}
@ -657,11 +657,11 @@ print_template = """/* This file was generated by generate-wire.py */
void print_message(const u8 *msg)
{{
switch ((enum {enumname})fromwire_peektype(msg)) {{
{printcases}
}}
\tswitch ((enum {enumname})fromwire_peektype(msg)) {{
\t{printcases}
\t}}
printf("UNKNOWN: %s\\n", tal_hex(msg, msg));
\tprintf("UNKNOWN: %s\\n", tal_hex(msg, msg));
}}
{func_decls}

Loading…
Cancel
Save