dwarves_fprintf: Move invariant printing of ; to outside if block
Will facilitate printing something just before the ;
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/dwarves.h b/dwarves.h
index 46083da..254cfe4 100644
--- a/dwarves.h
+++ b/dwarves.h
@@ -840,6 +840,7 @@
* @bitfield_size - size in the current bitfield
* @bit_hole - If there is a bit hole before the next one (or the end of the struct)
* @bitfield_end - Is this the last entry in a bitfield?
+ * @alignment - DW_AT_alignement, zero if not present, gcc emits since circa 7.3.1
* @accessibility - DW_ACCESS_{public,protected,private}
* @virtuality - DW_VIRTUALITY_{none,virtual,pure_virtual}
* @hole - If there is a hole before the next one (or the end of the struct)
@@ -856,6 +857,7 @@
uint8_t bit_hole;
uint8_t bitfield_end:1;
uint64_t const_value;
+ uint32_t alignment;
uint8_t visited:1;
uint8_t is_static:1;
uint8_t accessibility:2;
diff --git a/dwarves_fprintf.c b/dwarves_fprintf.c
index ef53e2b..47daeda 100644
--- a/dwarves_fprintf.c
+++ b/dwarves_fprintf.c
@@ -769,14 +769,14 @@
if (member->is_static) {
if (member->const_value != 0)
- printed += fprintf(fp, " = %" PRIu64 ";", member->const_value);
+ printed += fprintf(fp, " = %" PRIu64, member->const_value);
} else if (member->bitfield_size != 0) {
- printed += fprintf(fp, ":%u;", member->bitfield_size);
- } else {
- fputc(';', fp);
- ++printed;
+ printed += fprintf(fp, ":%u", member->bitfield_size);
}
+ fputc(';', fp);
+ ++printed;
+
if ((tag__is_union(type) || tag__is_struct(type) ||
tag__is_enumeration(type)) &&
/* Look if is a type defined inline */
