Namespace the struct trace_descriptor

[babeltrace.git] / formats / ctf / callbacks.c

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index 0c221f9da684e5dfe58b058548be4263fdbdabc7..3595532d5a05b4234777f5865c44e300b66b4ed0 100644 (file)
--- a/formats/ctf/callbacks.c
+++ b/formats/ctf/callbacks.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/babeltrace.h>
@@ -30,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;
@@ -48,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;
 }
@@ -81,7 +89,7 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
        tc = iter->parent.ctx->tc;
        for (i = 0; i < tc->array->len; i++) {
                struct ctf_trace *tin;
-               struct trace_descriptor *td_read;
+               struct bt_trace_descriptor *td_read;
 
                td_read = g_ptr_array_index(tc->array, i);
                tin = container_of(td_read, struct ctf_trace, parent);
@@ -188,6 +196,8 @@ void process_callbacks(struct bt_ctf_iter *iter,
        assert(iter && stream);
 
        ret = extract_ctf_stream_event(stream, &ctf_data);
+       if (ret)
+               goto end;
 
        /* process all events callback first */
        if (iter->main_callbacks.callback) {