X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=6920aabc6e697a2c07e03071ac4971e658afea60;hp=540bd11dd7500d6bbf4a09dde3713fde9a44dfdf;hb=60a977345d9e5e2631518f0d62aaa278baf42dd2;hpb=885a8803311f24d33ae0bdd4b0b2adf8cc057a24

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 540bd11d..6920aabc 100644
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -43,6 +43,7 @@
 #include <babeltrace/graph/notification-iterator.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/values.h>
+#include <babeltrace/values-internal.h>
 #include <babeltrace/logging.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -294,6 +295,7 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
 	const char *str_val;
 	int size;
 	int i;
+	enum bt_value_status status;
 
 	if (!value) {
 		return;
@@ -305,32 +307,46 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
 			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_BOOL:
-		bt_value_bool_get(value, &bool_val);
+		status = bt_value_bool_get(value, &bool_val);
+		if (status != BT_VALUE_STATUS_OK) {
+			goto error;
+		}
 		fprintf(fp, "%s%s%s%s\n", bt_common_color_bold(),
 			bt_common_color_fg_cyan(), bool_val ? "yes" : "no",
 			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_INTEGER:
-		bt_value_integer_get(value, &int_val);
+		status = bt_value_integer_get(value, &int_val);
+		if (status != BT_VALUE_STATUS_OK) {
+			goto error;
+		}
 		fprintf(fp, "%s%s%" PRId64 "%s\n", bt_common_color_bold(),
 			bt_common_color_fg_red(), int_val,
 			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_FLOAT:
-		bt_value_float_get(value, &dbl_val);
+		status = bt_value_float_get(value, &dbl_val);
+		if (status != BT_VALUE_STATUS_OK) {
+			goto error;
+		}
 		fprintf(fp, "%s%s%lf%s\n", bt_common_color_bold(),
 			bt_common_color_fg_red(), dbl_val,
 			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_STRING:
-		bt_value_string_get(value, &str_val);
+		status = bt_value_string_get(value, &str_val);
+		if (status != BT_VALUE_STATUS_OK) {
+			goto error;
+		}
 		fprintf(fp, "%s%s%s%s\n", bt_common_color_bold(),
 			bt_common_color_fg_green(), str_val,
 			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_ARRAY:
 		size = bt_value_array_size(value);
-		assert(size >= 0);
+		if (size < 0) {
+			goto error;
+		}
 
 		if (size == 0) {
 			print_indent(fp, indent);
@@ -342,7 +358,9 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
 			struct bt_value *element =
 					bt_value_array_get(value, i);
 
-			assert(element);
+			if (!element) {
+				goto error;
+			}
 			print_indent(fp, indent);
 			fprintf(fp, "- ");
 
@@ -386,6 +404,11 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
 	default:
 		abort();
 	}
+	return;
+
+error:
+	BT_LOGE("Error printing value of type %s.",
+		bt_value_type_string(bt_value_get_type(value)));
 }
 
 static