X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2.c;h=a59bb71c26e0cfe1947e5a847cc6408871ae99c2;hb=498e7994d60bd0e9f63c3d5c0fd00eec77ba7c34;hp=150b08fc12f69c079e65f5677a08fb267ec7c0bc;hpb=3eb16918a387958f9ce459b89f09347f6ee682a8;p=babeltrace.git

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index 150b08fc..a59bb71c 100644
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -193,7 +193,7 @@ const bt_component_class *find_component_class(const char *plugin_name,
 		comp_cls = bt_component_class_sink_as_component_class_const(find_sink_component_class(plugin_name, comp_class_name));
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	return comp_cls;
@@ -456,7 +456,7 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 		break;
 	}
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	goto end;
@@ -614,7 +614,7 @@ void print_cfg(struct bt_config *cfg)
 		print_cfg_print_lttng_live_sessions(cfg);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 }
 
@@ -2275,7 +2275,7 @@ int cmd_run_ctx_create_components_from_config_components(
 				cfg_comp->comp_cls_name->str);
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		if (!comp_cls) {
@@ -2310,7 +2310,7 @@ int cmd_run_ctx_create_components_from_config_components(
 				(void *) &comp);
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		if (ret) {
@@ -2353,7 +2353,7 @@ int cmd_run_ctx_create_components_from_config_components(
 				GUINT_TO_POINTER(quark), (void *) comp);
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		comp = NULL;
@@ -2536,7 +2536,7 @@ int cmd_run(struct bt_config *cfg)
 
 		switch (run_status) {
 		case BT_GRAPH_RUN_STATUS_OK:
-			break;
+			goto end;
 		case BT_GRAPH_RUN_STATUS_AGAIN:
 			if (bt_interrupter_is_set(the_interrupter)) {
 				BT_CLI_LOGW_APPEND_CAUSE(
@@ -2558,8 +2558,6 @@ int cmd_run(struct bt_config *cfg)
 				}
 			}
 			break;
-		case BT_GRAPH_RUN_STATUS_END:
-			goto end;
 		default:
 			if (bt_interrupter_is_set(the_interrupter)) {
 				BT_CLI_LOGW_APPEND_CAUSE(
@@ -2699,7 +2697,7 @@ void print_error_causes(void)
 				bt_error_cause_message_iterator_actor_get_component_class_type(cause));
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		/* Print file name and line number */
@@ -2812,7 +2810,7 @@ int main(int argc, const char **argv)
 		break;
 	default:
 		BT_LOGF("Invalid/unknown command: cmd=%d", cfg->command);
-		abort();
+		bt_common_abort();
 	}
 
 	BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d",