Cleanup: identical code for different branches

[babeltrace.git] / plugins / utils / trimmer / trimmer.c

diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c
index 2a8bd5e0b83c5fb4ae8d21977134a4cd432c536e..352b0cffa3405d2cdab76985548c00e249cb9f33 100644 (file)
--- a/plugins/utils/trimmer/trimmer.c
+++ b/plugins/utils/trimmer/trimmer.c
@@ -26,6 +26,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "PLUGIN-UTILS-TRIMMER-FLT"
+#include "logging.h"
+
 #include <babeltrace/compat/utc-internal.h>
 #include <babeltrace/plugin/plugin-dev.h>
 #include <babeltrace/graph/component.h>
@@ -50,14 +53,7 @@ void destroy_trimmer_data(struct trimmer *trimmer)
 static
 struct trimmer *create_trimmer_data(void)
 {
-       struct trimmer *trimmer;
-
-       trimmer = g_new0(struct trimmer, 1);
-       if (!trimmer) {
-               goto end;
-       }
-end:
-       return trimmer;
+       return g_new0(struct trimmer, 1);
 }
 
 void finalize_trimmer(struct bt_private_component *component)
@@ -305,7 +301,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
                value_ret = bt_value_bool_get(value, &gmt);
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
-                       printf_error("Failed to retrieve clock-gmt value. Expecting a boolean");
+                       BT_LOGE_STR("Failed to retrieve clock-gmt value. Expecting a boolean");
                }
        }
        bt_put(value);
@@ -322,7 +318,7 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
                if (value_ret || timestamp_from_arg(str,
                                trimmer, &trimmer->begin, gmt)) {
                        ret = BT_COMPONENT_STATUS_INVALID;
-                       printf_error("Failed to retrieve begin value. Expecting a timestamp string");
+                       BT_LOGE_STR("Failed to retrieve begin value. Expecting a timestamp string");
                }
        }
        bt_put(value);
@@ -339,14 +335,14 @@ enum bt_component_status init_from_params(struct trimmer *trimmer,
                if (value_ret || timestamp_from_arg(str,
                                trimmer, &trimmer->end, gmt)) {
                        ret = BT_COMPONENT_STATUS_INVALID;
-                       printf_error("Failed to retrieve end value. Expecting a timestamp string");
+                       BT_LOGE_STR("Failed to retrieve end value. Expecting a timestamp string");
                }
        }
        bt_put(value);
 end:
        if (trimmer->begin.set && trimmer->end.set) {
                if (trimmer->begin.value > trimmer->end.value) {
-                       printf_error("Unexpected: time range begin value is above end value");
+                       BT_LOGE_STR("Unexpected: time range begin value is above end value");
                        ret = BT_COMPONENT_STATUS_INVALID;
                }
        }