Fix: lttng_set_event_filter() was returning bad error code

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 3bef3b6d71a1e46c22883428382dbd247910b6d2..e4560bb7fb927895d5b11fd84db2338001b0507b 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -34,17 +34,17 @@
 #include <common/uri.h>
 #include <lttng/lttng.h>
 
-#include "filter-ast.h"
-#include "filter-parser.h"
-#include "filter-bytecode.h"
-#include "memstream.h"
+#include "filter/filter-ast.h"
+#include "filter/filter-parser.h"
+#include "filter/filter-bytecode.h"
+#include "filter/memstream.h"
 
 #ifdef DEBUG
-const int print_xml = 1;
+static const int print_xml = 1;
 #define dbg_printf(fmt, args...)       \
        printf("[debug liblttng-ctl] " fmt, ## args)
 #else
-const int print_xml = 0;
+static const int print_xml = 0;
 #define dbg_printf(fmt, args...)                               \
 do {                                                           \
        /* do nothing but check printf format */                \
@@ -524,7 +524,7 @@ static int ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
        }
 
        /* Check error code if OK */
-       if (llm.ret_code != LTTCOMM_OK) {
+       if (llm.ret_code != LTTNG_OK) {
                ret = -llm.ret_code;
                goto end;
        }
@@ -782,24 +782,24 @@ int lttng_set_event_filter(struct lttng_handle *handle,
                        strlen(filter_expression), "r");
        if (!fmem) {
                fprintf(stderr, "Error opening memory as stream\n");
-               return -ENOMEM;
+               return -LTTNG_ERR_FILTER_NOMEM;
        }
        ctx = filter_parser_ctx_alloc(fmem);
        if (!ctx) {
                fprintf(stderr, "Error allocating parser\n");
-               ret = -ENOMEM;
+               ret = -LTTNG_ERR_FILTER_NOMEM;
                goto alloc_error;
        }
        ret = filter_parser_ctx_append_ast(ctx);
        if (ret) {
                fprintf(stderr, "Parse error\n");
-               ret = -EINVAL;
+               ret = -LTTNG_ERR_FILTER_INVAL;
                goto parse_error;
        }
        ret = filter_visitor_set_parent(ctx);
        if (ret) {
                fprintf(stderr, "Set parent error\n");
-               ret = -EINVAL;
+               ret = -LTTNG_ERR_FILTER_INVAL;
                goto parse_error;
        }
        if (print_xml) {
@@ -807,7 +807,7 @@ int lttng_set_event_filter(struct lttng_handle *handle,
                if (ret) {
                        fflush(stdout);
                        fprintf(stderr, "XML print error\n");
-                       ret = -EINVAL;
+                       ret = -LTTNG_ERR_FILTER_INVAL;
                        goto parse_error;
                }
        }
@@ -817,7 +817,7 @@ int lttng_set_event_filter(struct lttng_handle *handle,
        ret = filter_visitor_ir_generate(ctx);
        if (ret) {
                fprintf(stderr, "Generate IR error\n");
-               ret = -EINVAL;
+               ret = -LTTNG_ERR_FILTER_INVAL;
                goto parse_error;
        }
        dbg_printf("done\n");
@@ -826,7 +826,7 @@ int lttng_set_event_filter(struct lttng_handle *handle,
        fflush(stdout);
        ret = filter_visitor_ir_check_binary_op_nesting(ctx);
        if (ret) {
-               ret = -EINVAL;
+               ret = -LTTNG_ERR_FILTER_INVAL;
                goto parse_error;
        }
        dbg_printf("done\n");
@@ -836,7 +836,7 @@ int lttng_set_event_filter(struct lttng_handle *handle,
        ret = filter_visitor_bytecode_generate(ctx);
        if (ret) {
                fprintf(stderr, "Generate bytecode error\n");
-               ret = -EINVAL;
+               ret = -LTTNG_ERR_FILTER_INVAL;
                goto parse_error;
        }
        dbg_printf("done\n");
@@ -1041,18 +1041,13 @@ int lttng_list_tracepoint_fields(struct lttng_handle *handle,
  */
 const char *lttng_strerror(int code)
 {
-       /* lttcomm error codes range from -LTTCOMM_OK down to -LTTCOMM_NR */
-       if (code > -LTTCOMM_OK) {
-               return "Ended with errors";
-       }
-
-       return lttcomm_get_readable_code(code);
+       return error_get_str(code);
 }
 
 /*
  * Create a brand new session using name and url for destination.
  *
- * Returns LTTCOMM_OK on success or a negative error code.
+ * Returns LTTNG_OK on success or a negative error code.
  */
 int lttng_create_session(const char *name, const char *url)
 {
@@ -1072,7 +1067,7 @@ int lttng_create_session(const char *name, const char *url)
        /* There should never be a data URL */
        size = parse_str_urls_to_uri(url, NULL, &uris);
        if (size < 0) {
-               return LTTCOMM_INVALID;
+               return LTTNG_ERR_INVALID;
        }
 
        lsm.u.uri.size = size;
@@ -1351,7 +1346,7 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 
        size = parse_str_urls_to_uri(control_url, data_url, &uris);
        if (size < 0) {
-               return LTTCOMM_INVALID;
+               return LTTNG_ERR_INVALID;
        }
 
        lsm.u.uri.size = size;
@@ -1543,7 +1538,7 @@ int _lttng_create_session_ext(const char *name, const char *url,
        /* There should never be a data URL */
        size = parse_str_urls_to_uri(url, NULL, &uris);
        if (size < 0) {
-               return LTTCOMM_INVALID;
+               return LTTNG_ERR_INVALID;
        }
 
        lsm.u.uri.size = size;