Logging: standardize logging tags

[babeltrace.git] / src / plugins / utils / counter / counter.c

diff --git a/src/plugins/utils/counter/counter.c b/src/plugins/utils/counter/counter.c
index 37ddd0306edb95af3989621332b53ddb10db63d1..42ac5ad6585b310efdad5c1fae0730ad4ace0341 100644 (file)
--- a/src/plugins/utils/counter/counter.c
+++ b/src/plugins/utils/counter/counter.c
@@ -20,13 +20,12 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-UTILS-COUNTER-FLT"
+#define BT_LOG_TAG "PLUGIN/FLT.UTILS.COUNTER"
 #include "logging.h"
 
 #include <babeltrace2/babeltrace.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include "common/common.h"
-#include "plugins/plugins-common.h"
 #include "common/assert.h"
 #include <inttypes.h>
 #include <stdint.h>
@@ -139,7 +138,7 @@ BT_HIDDEN
 bt_self_component_status counter_init(
                bt_self_component_sink *component,
                const bt_value *params,
-               UNUSED_VAR void *init_method_data)
+               __attribute__((unused)) void *init_method_data)
 {
        bt_self_component_status ret;
        struct counter *counter = g_new0(struct counter, 1);
@@ -236,7 +235,7 @@ bt_self_component_status counter_consume(
                        bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(counter);
 
-       if (unlikely(!counter->msg_iter)) {
+       if (G_UNLIKELY(!counter->msg_iter)) {
                try_print_last(counter);
                ret = BT_SELF_COMPONENT_STATUS_END;
                goto end;