Values API: standardize parameters and return values

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

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index eb68093c7aa3f5b31732f0921110c9e2e8be15f2..5ef2c7a70ee6af84b119e27d6dec2877c2c5a390 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -227,7 +227,8 @@ end:
 }
 
 static
-enum bt_component_status add_params_to_map(struct bt_value *plugin_opt_map)
+enum bt_component_status add_params_to_map(
+               struct bt_private_value *plugin_opt_map)
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        unsigned int i;
@@ -236,7 +237,8 @@ enum bt_component_status add_params_to_map(struct bt_value *plugin_opt_map)
                const char *key = plugin_options[i];
                enum bt_value_status status;
 
-               status = bt_value_map_insert_entry(plugin_opt_map, key, bt_value_null);
+               status = bt_private_value_map_insert_entry(plugin_opt_map, key,
+                       bt_value_null);
                switch (status) {
                case BT_VALUE_STATUS_OK:
                        break;
@@ -253,9 +255,10 @@ static
 bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
 {
        struct pretty_component *pretty = data;
-       struct bt_value *plugin_opt_map = pretty->plugin_opt_map;
 
-       if (!bt_value_map_has_entry(plugin_opt_map, key)) {
+       if (!bt_value_map_has_entry(
+                       bt_value_borrow_from_private(pretty->plugin_opt_map),
+                       key)) {
                fprintf(pretty->err,
                        "[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
        }
@@ -269,7 +272,6 @@ enum bt_component_status apply_one_string(const char *key,
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct bt_value *value = NULL;
-       enum bt_value_status status;
        const char *str;
 
        value = bt_value_map_borrow_entry_value(params, key);
@@ -279,15 +281,9 @@ enum bt_component_status apply_one_string(const char *key,
        if (bt_value_is_null(value)) {
                goto end;
        }
-       status = bt_value_string_get(value, &str);
-       switch (status) {
-       case BT_VALUE_STATUS_OK:
-               break;
-       default:
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
+       str = bt_value_string_get(value);
        *option = g_strdup(str);
+
 end:
        return ret;
 }
@@ -300,21 +296,13 @@ enum bt_component_status apply_one_bool(const char *key,
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct bt_value *value = NULL;
-       enum bt_value_status status;
        bt_bool bool_val;
 
        value = bt_value_map_borrow_entry_value(params, key);
        if (!value) {
                goto end;
        }
-       status = bt_value_bool_get(value, &bool_val);
-       switch (status) {
-       case BT_VALUE_STATUS_OK:
-               break;
-       default:
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
+       bool_val = bt_value_bool_get(value);
        *option = (bool) bool_val;
        if (found) {
                *found = true;
@@ -362,7 +350,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
        bool value, found;
        char *str = NULL;
 
-       pretty->plugin_opt_map = bt_value_map_create();
+       pretty->plugin_opt_map = bt_private_value_map_create();
        if (!pretty->plugin_opt_map) {
                ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
@@ -391,19 +379,16 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
                        goto end;
                }
 
-               status = bt_value_string_get(color_value, &color);
-               if (status) {
-                       warn_wrong_color_param(pretty);
+               color = bt_value_string_get(color_value);
+
+               if (strcmp(color, "never") == 0) {
+                       pretty->options.color = PRETTY_COLOR_OPT_NEVER;
+               } else if (strcmp(color, "auto") == 0) {
+                       pretty->options.color = PRETTY_COLOR_OPT_AUTO;
+               } else if (strcmp(color, "always") == 0) {
+                       pretty->options.color = PRETTY_COLOR_OPT_ALWAYS;
                } else {
-                       if (strcmp(color, "never") == 0) {
-                               pretty->options.color = PRETTY_COLOR_OPT_NEVER;
-                       } else if (strcmp(color, "auto") == 0) {
-                               pretty->options.color = PRETTY_COLOR_OPT_AUTO;
-                       } else if (strcmp(color, "always") == 0) {
-                               pretty->options.color = PRETTY_COLOR_OPT_ALWAYS;
-                       } else {
-                               warn_wrong_color_param(pretty);
-                       }
+                       warn_wrong_color_param(pretty);
                }
        }