Remove useless component/iterator validation functions

[babeltrace.git] / lib / graph / iterator.c

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index 1bfe3495051be8caa8d22d15b3532cceea794b65..56f4a2512e2227dbb2bccd8bde57adf4654e3b15 100644 (file)
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -349,6 +349,12 @@ void bt_notification_iterator_finalize(
                break;
        }
 
+       if (iterator->state == BT_NOTIFICATION_ITERATOR_STATE_ENDED) {
+               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED;
+       } else {
+               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED;
+       }
+
        assert(iterator->upstream_component);
        comp_class = iterator->upstream_component->class;
 
@@ -380,12 +386,6 @@ void bt_notification_iterator_finalize(
                        bt_private_notification_iterator_from_notification_iterator(iterator));
        }
 
-       if (iterator->state == BT_NOTIFICATION_ITERATOR_STATE_ENDED) {
-               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED;
-       } else {
-               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED;
-       }
-
        iterator->upstream_component = NULL;
        iterator->upstream_port = NULL;
 }
@@ -467,14 +467,8 @@ struct bt_notification_iterator *bt_notification_iterator_create(
        assert(bt_port_is_connected(upstream_port));
 
        type = bt_component_get_class_type(upstream_comp);
-       switch (type) {
-       case BT_COMPONENT_CLASS_TYPE_SOURCE:
-       case BT_COMPONENT_CLASS_TYPE_FILTER:
-               break;
-       default:
-               goto error;
-       }
-
+       assert(type == BT_COMPONENT_CLASS_TYPE_SOURCE ||
+               type == BT_COMPONENT_CLASS_TYPE_FILTER);
        iterator = g_new0(struct bt_notification_iterator, 1);
        if (!iterator) {
                goto error;
@@ -516,21 +510,6 @@ end:
        return iterator;
 }
 
-BT_HIDDEN
-enum bt_notification_iterator_status bt_notification_iterator_validate(
-               struct bt_notification_iterator *iterator)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVALID;
-               goto end;
-       }
-end:
-       return ret;
-}
-
 void *bt_private_notification_iterator_get_user_data(
                struct bt_private_notification_iterator *private_iterator)
 {