text output: wire up clock options, error checking

[babeltrace.git] / plugins / text / text.c

diff --git a/plugins/text/text.c b/plugins/text/text.c
index f9134b778fedea0d9d32b75aa0de68159dc6c62f..f5a62c63aeaa69ea82fb8758d7548f92e40c9589 100644 (file)
--- a/plugins/text/text.c
+++ b/plugins/text/text.c
@@ -4,6 +4,7 @@
  * Babeltrace CTF Text Output Plugin
  *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -65,7 +66,6 @@ const char *plugin_options[] = {
        "field-trace:vpid",
        "field-loglevel",
        "field-emf",
-       "field-callsite",
 };
 
 static
@@ -485,7 +485,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_loglevel_field = false;
                text->options.print_emf_field = false;
                text->options.print_emf_field = false;
-               text->options.print_callsite_field = false;
                break;
        case TEXT_DEFAULT_SHOW:
                text->options.print_trace_field = true;
@@ -496,7 +495,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_loglevel_field = true;
                text->options.print_emf_field = true;
                text->options.print_emf_field = true;
-               text->options.print_callsite_field = true;
                break;
        case TEXT_DEFAULT_HIDE:
                text->options.print_trace_field = false;
@@ -507,7 +505,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_loglevel_field = false;
                text->options.print_emf_field = false;
                text->options.print_emf_field = false;
-               text->options.print_callsite_field = false;
                break;
        default:
                ret = BT_COMPONENT_STATUS_ERROR;
@@ -594,15 +591,6 @@ enum bt_component_status apply_params(struct text_component *text,
                text->options.print_emf_field = value;
        }
 
-       value = false;
-       found = false;
-       ret = apply_one_bool("field-callsite", params, &value, &found);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto end;
-       }
-       if (found) {
-               text->options.print_callsite_field = value;
-       }
 end:
        bt_put(text->plugin_opt_map);
        text->plugin_opt_map = NULL;