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

type_to_string: make type printing dynamic.

Browse Source 
The union still contains all the types, but we can only print
the ones which are linked in.

This makes it much easier to use type_to_string in different binaries
without pulling in the world.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-01-04 14:06:15 +10:30
parent f8eb454139
commit 5bd8063ddb
2 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
type_to_string.c
View File

@@ -11,6 +11,8 @@
#include <ccan/tal/str/str.h>
#include <inttypes.h>
REGISTER_TYPE_TO_STRING(netaddr, netaddr_name);
char *type_to_string_(const tal_t *ctx, const char *typename,
union printable_types u)
{
@@ -78,9 +80,26 @@ char *type_to_string_(const tal_t *ctx, const char *typename,
&u.cstate->side[LOCAL]),
type_to_string(ctx, struct channel_oneside,
&u.cstate->side[REMOTE]));
} else if (streq(typename, "struct netaddr")) {
s = netaddr_name(ctx, u.netaddr);
}
} else {
size_t i;
static size_t num_p;
static struct type_to_string **t = NULL;
if (!t)
t = autodata_get(type_to_string, &num_p);
/* Typenames in registrations don't include "struct " */
if (strstarts(typename, "struct "))
typename += strlen("struct ");
for (i = 0; i < num_p; i++) {
if (streq(t[i]->typename, typename)) {
s = t[i]->fmt(ctx, u);
break;
}
}
if (!s)
s = tal_fmt(ctx, "UNKNOWN TYPE %s", typename);
}
return s;
}