trackers: update list/track/untrack commands

[lttng-tools.git] / tests / regression / tools / mi / extract_xml.c

diff --git a/tests/regression/tools/mi/extract_xml.c b/tests/regression/tools/mi/extract_xml.c
index ae07689e239f4a44168d91b396f4a649fc68d134..eb1fc02b4b2b9dc2a452d31f4938996d0596c300 100644 (file)
--- a/tests/regression/tools/mi/extract_xml.c
+++ b/tests/regression/tools/mi/extract_xml.c
@@ -33,10 +33,11 @@
  *     node;b;
  *     node;c;
  */
  *     node;b;
  *     node;c;
  */

-#include <stdlib.h>
+#include <assert.h>
+#include <stdbool.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

-#include <assert.h>

 #include <unistd.h>
 
 #include <libxml/tree.h>
 #include <unistd.h>
 
 #include <libxml/tree.h>


@@ -47,9 +48,9 @@
 
 #if defined(LIBXML_XPATH_ENABLED)
 
 
 #if defined(LIBXML_XPATH_ENABLED)
 

-
-int opt_verbose;
-int node_exist;
+static int opt_verbose;
+static int node_exist;
+static bool result = false;

 
 /**
  * print_xpath_nodes:
 
 /**
  * print_xpath_nodes:


@@ -86,7 +87,7 @@ static int print_xpath_nodes(xmlDocPtr doc, xmlNodeSetPtr nodes, FILE *output)
                                        node_child_value_string = xmlNodeListGetString(doc,
                                                        cur->children, 1);
                                        if (node_exist) {
                                        node_child_value_string = xmlNodeListGetString(doc,
                                                        cur->children, 1);
                                        if (node_exist) {

-                                               fprintf(output, "true\n");
+                                               result = true;

                                        } else if (opt_verbose) {
                                                fprintf(output, "%s;%s;\n", cur->name,
                                                                node_child_value_string);
                                        } else if (opt_verbose) {
                                                fprintf(output, "%s;%s;\n", cur->name,
                                                                node_child_value_string);


@@ -98,7 +99,7 @@ static int print_xpath_nodes(xmlDocPtr doc, xmlNodeSetPtr nodes, FILE *output)
                                } else {
                                        /* We don't want to print non-final element */
                                        if (node_exist) {
                                } else {
                                        /* We don't want to print non-final element */
                                        if (node_exist) {

-                                               fprintf(output, "true\n");
+                                               result = true;

                                        } else {
                                                fprintf(stderr, "ERR:%s\n",
                                                                "Xpath expression return non-final xml element");
                                        } else {
                                                fprintf(stderr, "ERR:%s\n",
                                                                "Xpath expression return non-final xml element");


@@ -108,7 +109,7 @@ static int print_xpath_nodes(xmlDocPtr doc, xmlNodeSetPtr nodes, FILE *output)
                                }
                        } else {
                                if (node_exist) {
                                }
                        } else {
                                if (node_exist) {

-                                       fprintf(output, "true\n");
+                                       result = true;

                                } else {
                                        /* We don't want to print non-final element */
                                        fprintf(stderr, "ERR:%s\n",
                                } else {
                                        /* We don't want to print non-final element */
                                        fprintf(stderr, "ERR:%s\n",


@@ -121,7 +122,7 @@ static int print_xpath_nodes(xmlDocPtr doc, xmlNodeSetPtr nodes, FILE *output)
                } else {
                        cur = nodes->nodeTab[i];
                        if (node_exist) {
                } else {
                        cur = nodes->nodeTab[i];
                        if (node_exist) {

-                               fprintf(output, "true\n");
+                               result = true;

                        } else if (opt_verbose) {
                                fprintf(output, "%s;%s;\n", cur->parent->name, cur->content);
                        } else {
                        } else if (opt_verbose) {
                                fprintf(output, "%s;%s;\n", cur->parent->name, cur->content);
                        } else {


@@ -221,6 +222,9 @@ static int extract_xpath(const char *xml_path, const xmlChar *xpath)
                xmlFreeDoc(doc);
                return -1;
        }
                xmlFreeDoc(doc);
                return -1;
        }

+       if (node_exist && result) {
+               fprintf(stdout, "true\n");
+       }

 
        /* Cleanup */
        xmlXPathFreeObject(xpathObj);
 
        /* Cleanup */
        xmlXPathFreeObject(xpathObj);