Rename `enum lttng_enabler_type` to `_format_type`

[deliverable/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 24769a7d6571f5fe49ea90ab4f1dcc7443b822ba..126863d7455f20ab127006e3b880590273a01fd1 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -38,21 +38,25 @@
  */
 
 #define _LGPL_SOURCE
-#include <lttng/ust-abi.h>
-#include <lttng/ust-error.h>
+#include <stdint.h>
+#include <unistd.h>
+
 #include <urcu/compiler.h>
 #include <urcu/list.h>
+
+#include <helper.h>
+#include <lttng/tracepoint.h>
+#include <lttng/ust-abi.h>
+#include <lttng/ust-error.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
-#include <lttng/tracepoint.h>
 #include <ust-fd.h>
-#include "tracepoint-internal.h"
 #include <usterr-signal-safe.h>
-#include <helper.h>
+
+#include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/shm.h"
 #include "lttng-tracer.h"
 #include "string-utils.h"
-#include "../libringbuffer/shm.h"
-#include "../libringbuffer/frontend_types.h"
 
 #define OBJ_NAME_LEN   16
 
@@ -793,7 +797,7 @@ static
 int lttng_abi_create_enabler(int channel_objd,
                           struct lttng_ust_event *event_param,
                           void *owner,
-                          enum lttng_enabler_type type)
+                          enum lttng_enabler_format_type format_type)
 {
        struct lttng_channel *channel = objd_private(channel_objd);
        struct lttng_enabler *enabler;
@@ -809,7 +813,7 @@ int lttng_abi_create_enabler(int channel_objd,
         * We tolerate no failure path after event creation. It will stay
         * invariant for the rest of the session.
         */
-       enabler = lttng_enabler_create(type, event_param, channel);
+       enabler = lttng_enabler_create(format_type, event_param, channel);
        if (!enabler) {
                ret = -ENOMEM;
                goto event_error;
@@ -888,10 +892,10 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
                         * we create the special star globbing enabler.
                         */
                        return lttng_abi_create_enabler(objd, event_param,
-                                       owner, LTTNG_ENABLER_STAR_GLOB);
+                                       owner, LTTNG_ENABLER_FORMAT_STAR_GLOB);
                } else {
                        return lttng_abi_create_enabler(objd, event_param,
-                                       owner, LTTNG_ENABLER_EVENT);
+                                       owner, LTTNG_ENABLER_FORMAT_EVENT);
                }
        }
        case LTTNG_UST_CONTEXT: