Remove loglevel iter (will be performed by tracepoint iteration)

[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 76f78702db080b1dcb04a5a2dad8927cf2fe60fb..e6ffa41f071e2f50a40ab826ab577ba2674ca4bf 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -28,8 +28,9 @@
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/core.h"
+#include <lttng/ust-version.h>
+#include <usterr-signal-safe.h>
+#include <helper.h>
 #include "ltt-tracer.h"
 #include "tracepoint-internal.h"
 
@@ -249,9 +250,9 @@ static
 long lttng_abi_tracer_version(int objd,
        struct lttng_ust_tracer_version *v)
 {
-       v->major = LTTNG_UST_MAJOR;
-       v->minor = LTTNG_UST_MINOR;
-       v->patchlevel = LTTNG_UST_PATCHLEVEL;
+       v->major = LTTNG_UST_MAJOR_VERSION;
+       v->minor = LTTNG_UST_MINOR_VERSION;
+       v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
        return 0;
 }
 
@@ -333,13 +334,14 @@ void lttng_metadata_create_events(int channel_objd)
                .name = "lttng_ust:metadata",
        };
        struct ltt_event *event;
+       int ret;
 
        /*
         * We tolerate no failure path after event creation. It will stay
         * invariant for the rest of the session.
         */
-       event = ltt_event_create(channel, &metadata_params, NULL);
-       if (!event) {
+       ret = ltt_event_create(channel, &metadata_params, NULL, &event);
+       if (ret < 0) {
                goto create_error;
        }
        return;
@@ -655,9 +657,8 @@ int lttng_abi_create_event(int channel_objd,
         * We tolerate no failure path after event creation. It will stay
         * invariant for the rest of the session.
         */
-       event = ltt_event_create(channel, event_param, NULL);
-       if (!event) {
-               ret = -EINVAL;
+       ret = ltt_event_create(channel, event_param, NULL, &event);
+       if (ret < 0) {
                goto event_error;
        }
        objd_set_private(event_objd, event);