From c725abddd1e52934a5a9f9d796ff84bf3dd838f4 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 31 Jan 2017 02:50:22 -0500 Subject: [PATCH] Rename *create_iterator*() -> *create_notification_iterator*() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- converter/babeltrace.c | 4 ++-- include/babeltrace/component/component-filter.h | 4 ++-- include/babeltrace/component/component-source.h | 4 ++-- lib/component/filter.c | 4 ++-- lib/component/source.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 0407fb2d..131a3c04 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -400,7 +400,7 @@ int connect_source_sink(struct bt_component *source, struct bt_notification_iterator *source_it = NULL; struct bt_notification_iterator *to_sink_it = NULL; - source_it = bt_component_source_create_iterator(source); + source_it = bt_component_source_create_notification_iterator(source); if (!source_it) { fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n"); ret = -1; @@ -428,7 +428,7 @@ int connect_source_sink(struct bt_component *source, goto end; } - to_sink_it = bt_component_filter_create_iterator(trimmer); + to_sink_it = bt_component_filter_create_notification_iterator(trimmer); if (!to_sink_it) { fprintf(stderr, "Failed to instantiate trimmer iterator. Aborting...\n"); ret = -1; diff --git a/include/babeltrace/component/component-filter.h b/include/babeltrace/component/component-filter.h index 1c0373bc..cba61f68 100644 --- a/include/babeltrace/component/component-filter.h +++ b/include/babeltrace/component/component-filter.h @@ -56,11 +56,11 @@ enum bt_component_status bt_component_filter_add_iterator( * @returns Notification iterator instance */ extern -struct bt_notification_iterator *bt_component_filter_create_iterator( +struct bt_notification_iterator *bt_component_filter_create_notification_iterator( struct bt_component *component); extern -struct bt_notification_iterator *bt_component_filter_create_iterator_with_init_method_data( +struct bt_notification_iterator *bt_component_filter_create_notification_iterator_with_init_method_data( struct bt_component *component, void *init_method_data); /* Defaults to 1. */ diff --git a/include/babeltrace/component/component-source.h b/include/babeltrace/component/component-source.h index 5ada76d5..662fe39d 100644 --- a/include/babeltrace/component/component-source.h +++ b/include/babeltrace/component/component-source.h @@ -44,11 +44,11 @@ struct bt_notification_iterator; * @returns Notification iterator instance */ extern -struct bt_notification_iterator *bt_component_source_create_iterator( +struct bt_notification_iterator *bt_component_source_create_notification_iterator( struct bt_component *component); extern -struct bt_notification_iterator *bt_component_source_create_iterator_with_init_method_data( +struct bt_notification_iterator *bt_component_source_create_notification_iterator_with_init_method_data( struct bt_component *component, void *init_method_data); #ifdef __cplusplus diff --git a/lib/component/filter.c b/lib/component/filter.c index dc170e36..153e38f2 100644 --- a/lib/component/filter.c +++ b/lib/component/filter.c @@ -180,13 +180,13 @@ end: return ret; } -struct bt_notification_iterator *bt_component_filter_create_iterator( +struct bt_notification_iterator *bt_component_filter_create_notification_iterator( struct bt_component *component) { return bt_component_create_iterator(component, NULL); } -struct bt_notification_iterator *bt_component_filter_create_iterator_with_init_method_data( +struct bt_notification_iterator *bt_component_filter_create_notification_iterator_with_init_method_data( struct bt_component *component, void *init_method_data) { return bt_component_create_iterator(component, init_method_data); diff --git a/lib/component/source.c b/lib/component/source.c index 7f462763..393b12f8 100644 --- a/lib/component/source.c +++ b/lib/component/source.c @@ -80,13 +80,13 @@ end: return source ? &source->parent : NULL; } -struct bt_notification_iterator *bt_component_source_create_iterator( +struct bt_notification_iterator *bt_component_source_create_notification_iterator( struct bt_component *component) { return bt_component_create_iterator(component, NULL); } -struct bt_notification_iterator *bt_component_source_create_iterator_with_init_method_data( +struct bt_notification_iterator *bt_component_source_create_notification_iterator_with_init_method_data( struct bt_component *component, void *init_method_data) { return bt_component_create_iterator(component, init_method_data); -- 2.34.1