Expose text arrays the same way as regular arrays

Store the content of text arrays both in the "elems" array and in a
string. While it does duplicate the data, this makes it possible to
access arrays containing UTF-8 or ASCII data the same way as regular
arrays.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index ea3ecfd8a656d5db9b4f389ee1302b5b6b5926ca..04801d4f05455df71160f85b4cd0ed6d58c9d180 100644 (file)
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -56,8 +56,6 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
                                g_string_insert_len(array_definition->string,
                                        0, (char *) ctf_get_pos_addr(pos),
                                        array_declaration->len);
                                g_string_insert_len(array_definition->string,
                                        0, (char *) ctf_get_pos_addr(pos),
                                        array_declaration->len);

-                               ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
-                               return 0;

                        }
                }
        }
                        }
                }
        }

diff --git a/types/array.c b/types/array.c
index c9b973bfa13a3d3719c9bdf1d07259c1d7880fa8..e4b43d8b5fe692f44eee37b11c7947229ca6356a 100644 (file)
--- a/types/array.c
+++ b/types/array.c
@@ -131,11 +131,6 @@ struct bt_definition *
                      || integer_declaration->encoding == CTF_STRING_ASCII) {
 
                        array->string = g_string_new("");
                      || integer_declaration->encoding == CTF_STRING_ASCII) {
 
                        array->string = g_string_new("");

-
-                       if (integer_declaration->len == CHAR_BIT
-                           && integer_declaration->p.alignment == CHAR_BIT) {
-                               return &array->p;
-                       }

                }
        }
 
                }
        }