From 873ed6e236f7669afd3ef44259c34addc6dc95b6 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 27 May 2021 21:17:16 +0100 Subject: treebuilder: Fix debug build variant with new element_type_to_name(). This uses the gperf-generated wordlist. --- src/treebuilder/element-type.c | 19 +++++++++++++++++++ src/treebuilder/element-type.h | 8 ++++++++ src/treebuilder/treebuilder.c | 19 ------------------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/treebuilder/element-type.c b/src/treebuilder/element-type.c index f6d3247..7e2772c 100644 --- a/src/treebuilder/element-type.c +++ b/src/treebuilder/element-type.c @@ -28,3 +28,22 @@ element_type element_type_from_name( return value->type; } + +/** + * Convert an element type to a name + * + * \param type The element type + * \return Pointer to name + */ +const char *element_type_to_name(element_type type) +{ + size_t i; + + for (i = 0; i < sizeof(wordlist) / sizeof(wordlist[0]); i++) { + if (wordlist[i].type == type) { + return wordlist[i].name; + } + } + + return "UNKNOWN"; +} diff --git a/src/treebuilder/element-type.h b/src/treebuilder/element-type.h index 93b168c..75612fd 100644 --- a/src/treebuilder/element-type.h +++ b/src/treebuilder/element-type.h @@ -53,5 +53,13 @@ element_type element_type_from_name( hubbub_treebuilder *treebuilder, const hubbub_string *tag_name); +/** + * Convert an element type to a name + * + * \param type The element type + * \return Pointer to name + */ +const char *element_type_to_name(element_type type); + #endif diff --git a/src/treebuilder/treebuilder.c b/src/treebuilder/treebuilder.c index 2d2d047..f11875e 100644 --- a/src/treebuilder/treebuilder.c +++ b/src/treebuilder/treebuilder.c @@ -1397,24 +1397,5 @@ void formatting_list_dump(hubbub_treebuilder *treebuilder, FILE *fp) } } -/** - * Convert an element type to a name - * - * \param type The element type - * \return Pointer to name - */ -const char *element_type_to_name(element_type type) -{ - size_t i; - - for (i = 0; - i < sizeof(name_type_map) / sizeof(name_type_map[0]); - i++) { - if (name_type_map[i].type == type) - return name_type_map[i].name; - } - - return "UNKNOWN"; -} #endif -- cgit v1.2.3