sink.text.pretty: remove logging (not used)

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I5449d5a3aa89466764bea8ba7523c580ac695e29
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1457
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index 7da507126553af5449bbffb63c65ea2adafb32a4..8d844f6af6ce41c50f785edde8c8c6072cbc438d 100644 (file)
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -63,7 +63,6 @@ static const char* log_level_env_var_names[] = {
        "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL",
        "BABELTRACE_PYTHON_BT2_LOG_LEVEL",
        "BABELTRACE_SINK_CTF_FS_LOG_LEVEL",
-       "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL",
        "BABELTRACE_SINK_TEXT_DETAILS_LOG_LEVEL",
        "BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
        "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",

diff --git a/src/plugins/text/pretty/Makefile.am b/src/plugins/text/pretty/Makefile.am
index 37000e1323701257df5752969d1e53b6f1a19adc..33744797009fb9c201fa7b8c87474dbf73aaec86 100644 (file)
--- a/src/plugins/text/pretty/Makefile.am
+++ b/src/plugins/text/pretty/Makefile.am
@@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libbabeltrace2-plugin-text-pretty-cc.la
 
 # ctf-text plugin
 libbabeltrace2_plugin_text_pretty_cc_la_SOURCES = \
-       logging.c \
-       logging.h \
        pretty.c \
        pretty.h \
        print.c

diff --git a/src/plugins/text/pretty/logging.c b/src/plugins/text/pretty/logging.c
deleted file mode 100644 (file)
index 03dd9c1..0000000
--- a/src/plugins/text/pretty/logging.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2019 Francis Deslauriers <francis.deslauriers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#define BT_LOG_OUTPUT_LEVEL bt_plugin_text_pretty_log_level
-#include "logging/log.h"
-
-BT_LOG_INIT_LOG_LEVEL(bt_plugin_text_pretty_log_level,
-       "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL");

diff --git a/src/plugins/text/pretty/logging.h b/src/plugins/text/pretty/logging.h
deleted file mode 100644 (file)
index 61d4f2b..0000000
--- a/src/plugins/text/pretty/logging.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef PLUGINS_TEXT_PRETTY_LOG_LEVEL
-#define PLUGINS_TEXT_PRETTY_LOG_LEVEL
-
-/*
- * Copyright (c) 2019 Francis Deslauriers <francis.deslauriers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#define BT_LOG_OUTPUT_LEVEL bt_plugin_text_pretty_log_level
-#include "logging/log.h"
-
-BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_text_pretty_log_level);
-
-#endif /* PLUGINS_TEXT_PRETTY_LOG_LEVEL */

diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index 95abda08cc9229b27cd715aa98639cd46cb17bae..b17426c251f96944a20ab6f9c99eb4cf79a16f61 100644 (file)
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -23,15 +23,13 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN/SINK.TEXT.PRETTY"
-#include "logging.h"
-
 #include <babeltrace2/babeltrace.h>
 #include "compat/compiler.h"
 #include "common/common.h"
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
+#include <string.h>
 #include "common/assert.h"
 
 #include "pretty.h"