* Julien Desfossez ([email protected]) wrote: > Use the bt_ prefix instead of babeltrace_
patches 1 to 7 merged, thanks ! Mathieu > > Signed-off-by: Julien Desfossez <[email protected]> > --- > formats/ctf/callbacks.c | 6 +++--- > include/babeltrace/ctf/callbacks.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c > index 71e3248..793f3d3 100644 > --- a/formats/ctf/callbacks.c > +++ b/formats/ctf/callbacks.c > @@ -38,7 +38,7 @@ > #include <inttypes.h> > > static > -struct bt_dependencies *_babeltrace_dependencies_create(const char *first, > +struct bt_dependencies *_bt_dependencies_create(const char *first, > va_list ap) > { > const char *iter; > @@ -56,13 +56,13 @@ struct bt_dependencies > *_babeltrace_dependencies_create(const char *first, > return dep; > } > > -struct bt_dependencies *babeltrace_dependencies_create(const char *first, > ...) > +struct bt_dependencies *bt_dependencies_create(const char *first, ...) > { > va_list ap; > struct bt_dependencies *deps; > > va_start(ap, first); > - deps = _babeltrace_dependencies_create(first, ap); > + deps = _bt_dependencies_create(first, ap); > va_end(ap); > return deps; > } > diff --git a/include/babeltrace/ctf/callbacks.h > b/include/babeltrace/ctf/callbacks.h > index c178767..bc75769 100644 > --- a/include/babeltrace/ctf/callbacks.h > +++ b/include/babeltrace/ctf/callbacks.h > @@ -51,13 +51,13 @@ enum bt_cb_ret { > /* > * Receives a variable number of strings as parameter, ended with NULL. > */ > -struct bt_dependencies *babeltrace_dependencies_create(const char *first, > ...); > +struct bt_dependencies *bt_dependencies_create(const char *first, ...); > > /* > * struct bt_dependencies must be destroyed explicitly if not passed as > * parameter to a bt_ctf_iter_add_callback(). > */ > -void babeltrace_dependencies_destroy(struct bt_dependencies *dep); > +void bt_dependencies_destroy(struct bt_dependencies *dep); > > /* > * bt_ctf_iter_add_callback: Add a callback to iterator. > -- > 1.7.10.4 > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
