commit 25252880bda3c670b37b8908143858e087b6280f
author Giuliano Procida <gprocida@google.com> Tue Sep 21 18:40:57 2021 +0100
committer Giuliano Procida <gprocida@google.com> Mon Oct 11 15:21:37 2021 +0000
tree d5540576ba4ffe07fc35f95be5cfd8d39b349122
parent 2fb8ba4a7e898307661e0759d617ba7f901439b5

abitidy: strip naming-typedef-id from more elements

Upstream libabigail is adding these to enum-decl and presumably,
union-decl may follow.

Bug: 194371728
Change-Id: I67fc680c7103d6b17e240d171ed1cbef6ddf6c12
Signed-off-by: Giuliano Procida <gprocida@google.com>

tools/abitidy.cc

diff --git a/tools/abitidy.cc b/tools/abitidy.cc
index ed07cbd..201c39e 100644
--- a/tools/abitidy.cc
+++ b/tools/abitidy.cc
@@ -373,7 +373,10 @@
 {
   if (node->type != XML_ELEMENT_NODE)
     return;
-  if (strcmp(from_libxml(node->name), "class-decl") == 0)
+  const char* node_name = from_libxml(node->name);
+  if (strcmp(node_name, "class-decl") == 0
+      || strcmp(node_name, "union-decl") == 0
+      || strcmp(node_name, "enum-decl") == 0)
     set_attribute(node, "naming-typedef-id", {});
   for (xmlNodePtr child : get_children(node))
     discard_naming_typedefs(child);