*
* 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>
#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;
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;
}
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);
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) {
for (i = 0; i < iter->main_callbacks.callback->len; i++) {
cb = &g_array_index(iter->main_callbacks.callback, struct bt_callback, i);
- if (!cb)
- goto end;
ret = cb->callback(&ctf_data, cb->private_data);
switch (ret) {
case BT_CB_OK_STOP:
for (i = 0; i < bt_chain->callback->len; i++) {
cb = &g_array_index(bt_chain->callback, struct bt_callback, i);
- if (!cb)
- goto end;
ret = cb->callback(&ctf_data, cb->private_data);
switch (ret) {
case BT_CB_OK_STOP: