API : iterator namespace cleanup

[babeltrace.git] / include / babeltrace / babeltrace.h

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index c37e846b45179b6bd0c34f874d548c8be4705c3a..aacedaebcede77bb2ea630463f5839593ffcce22 100644 (file)
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -23,7 +23,7 @@
 typedef GQuark bt_event_name;
 
 /* Forward declarations */
-struct babeltrace_iter;
+struct bt_iter;
 struct ctf_stream_event;
 struct ctf_stream;
 struct bt_dependencies;
@@ -47,12 +47,12 @@ struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...);
 
 /*
  * struct bt_dependencies must be destroyed explicitly if not passed as
- * parameter to a babeltrace_iter_add_callback().
+ * parameter to a bt_iter_add_callback().
  */
 void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
 
 /*
- * babeltrace_iter_add_callback: Add a callback to iterator.
+ * bt_iter_add_callback: Add a callback to iterator.
  *
  * @iter: trace collection iterator (input)
  * @event: event to target. 0 for all events.
@@ -76,17 +76,17 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  * destroyed, but they belong to the babeltrace library.
  *
  * (note to implementor: we need to keep a gptrarray of struct
- * bt_dependencies to "garbage collect" in struct babeltrace_iter, and
+ * bt_dependencies to "garbage collect" in struct bt_iter, and
  * dependencies need to have a refcount to handle the case where they
  * would be passed to more than one iterator. Upon iterator detroy, we
  * iterate on all the gc ptrarray and decrement the refcounts, freeing
  * if we reach 0.)
  * (note to implementor: we calculate the dependency graph when
- * babeltrace_iter_read_event() is executed after a
- * babeltrace_iter_add_callback(). Beware that it is valid to create/add
+ * bt_iter_read_event() is executed after a
+ * bt_iter_add_callback(). Beware that it is valid to create/add
  * callbacks/read/add more callbacks/read some more.)
  */
-int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
+int bt_iter_add_callback(struct bt_iter *iter,
                bt_event_name event, void *private_data, int flags,
                enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
                                           void *caller_data),