Distinguish UST return codes from transport return codes

[lttng-ust.git] / liblttng-ust / lttng-ust-abi.c

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 12b42ea9b0a1d335b0a937330ab24c4806d11e1d..bbbcd062e1bd19026820f20ed64046009d021a14 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -38,6 +38,7 @@
  */
 
 #include <lttng/ust-abi.h>
+#include <lttng/ust-error.h>
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 #include <lttng/ust-events.h>
@@ -263,9 +264,9 @@ static
 long lttng_abi_tracer_version(int objd,
        struct lttng_ust_tracer_version *v)
 {
-       v->major = LTTNG_UST_MAJOR_VERSION;
-       v->minor = LTTNG_UST_MINOR_VERSION;
-       v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
+       v->major = LTTNG_UST_INTERNAL_MAJOR_VERSION;
+       v->minor = LTTNG_UST_INTERNAL_MINOR_VERSION;
+       v->patchlevel = LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION;
        return 0;
 }
 
@@ -541,7 +542,7 @@ long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg,
        retry:
                iter = lttng_ust_tracepoint_list_get_iter_next(list);
                if (!iter)
-                       return -ENOENT;
+                       return -LTTNG_UST_ERR_NOENT;
                if (!strcmp(iter->name, "lttng_ust:metadata"))
                        goto retry;
                memcpy(tp, iter, sizeof(*tp));
@@ -623,7 +624,7 @@ long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd,
        retry:
                iter = lttng_ust_field_list_get_iter_next(list);
                if (!iter)
-                       return -ENOENT;
+                       return -LTTNG_UST_ERR_NOENT;
                if (!strcmp(iter->event_name, "lttng_ust:metadata"))
                        goto retry;
                memcpy(tp, iter, sizeof(*tp));