ctf: append error causes when returning errors

[babeltrace.git] / src / plugins / ctf / common / metadata / parser.y

diff --git a/src/plugins/ctf/common/metadata/parser.y b/src/plugins/ctf/common/metadata/parser.y
index bada61d74bfdae66348517fdb85b6eee740187a7..cb4eb74f42fbfbf7f1416a58cb7fe4a18a72443b 100644 (file)
--- a/src/plugins/ctf/common/metadata/parser.y
+++ b/src/plugins/ctf/common/metadata/parser.y
@@ -266,7 +266,7 @@ int import_string(struct ctf_scanner *scanner, YYSTYPE *lvalp,
        lvalp->s = objstack_alloc(scanner->objstack, len);
        if (src[0] == 'L') {
                // TODO: import wide string
-               _BT_LOGE_LINENO(yyget_lineno(scanner),
+               _BT_LOGE_APPEND_CAUSE_LINENO(yyget_lineno(scanner),
                        "wide characters are not supported as of this version: "
                        "scanner-addr=%p", scanner);
                return -1;
@@ -352,7 +352,7 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 
        node = objstack_alloc(scanner->objstack, sizeof(*node));
        if (!node) {
-               _BT_LOGE_LINENO(yyget_lineno(scanner->scanner),
+               _BT_LOGE_APPEND_CAUSE_LINENO(yyget_lineno(scanner->scanner),
                        "failed to allocate one stack entry: "
                        "scanner-addr=%p", scanner);
                return &error_node;
@@ -922,7 +922,7 @@ static int set_parent_node(struct ctf_node *node,
 static
 void yyerror(struct ctf_scanner *scanner, yyscan_t yyscanner, const char *str)
 {
-       _BT_LOGE_LINENO(yyget_lineno(scanner->scanner),
+       _BT_LOGE_APPEND_CAUSE_LINENO(yyget_lineno(scanner->scanner),
                "%s: token=\"%s\"", str, yyget_text(scanner->scanner));
 }
 
@@ -1001,7 +1001,24 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 
        if (!scanner)
                return;
-       finalize_scope(&scanner->root_scope);
+
+       struct ctf_scanner_scope *scope = scanner->cs;
+
+       do {
+               struct ctf_scanner_scope *parent = scope->parent;
+               finalize_scope(scope);
+
+               /*
+                * The root scope is allocated within the ctf_scanner structure,
+                * do doesn't need freeing.  All others are allocated on their
+                * own.
+                */
+               if (scope != &scanner->root_scope)
+                       free(scope);
+
+               scope = parent;
+       } while (scope);
+
        objstack_destroy(scanner->objstack);
        ret = yylex_destroy(scanner->scanner);
        if (ret)