libctf: dump: dump struct-based bitfields

diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c
index d318b576a3de1a3b83f2cd3072431a419d004d7d..f76dec97fb673694ac7a3f4b6e0046b29f0ba77f 100644 (file)
--- a/libctf/ctf-dump.c
+++ b/libctf/ctf-dump.c
@@ -723,12 +723,26 @@ ctf_dump_member (ctf_dict_t *fp, const char *name, ctf_id_t id,
                                       | CTF_FT_ID)) == NULL)
     return -1;                         /* errno is set for us.  */
 
-  if (asprintf (&bit, "[0x%lx] %s: %s\n", offset, name, typestr) < 0)
+  if (asprintf (&bit, "[0x%lx] %s:", offset, name) < 0)
     goto oom;
+  *state->cdm_str = str_append (*state->cdm_str, bit);
+  free (bit);
+
+  if (bit_width > 0)
+    {
+      if (asprintf (&bit, "%i:", bit_width) < 0)
+       goto oom;
+      *state->cdm_str = str_append (*state->cdm_str, bit);
+      free (bit);
+    }
 
+  if (asprintf (&bit, " %s\n", typestr) < 0)
+    goto oom;
   *state->cdm_str = str_append (*state->cdm_str, bit);
+
   free (typestr);
   free (bit);
+
   typestr = NULL;
   bit = NULL;