X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fcallbacks.c;h=a8c376f5d98b79945ebc358d05eb01ace83f3007;hb=0686ef9496b70a2b1e401375ca6ffd529c4b2a34;hp=16c7e0a186a466f6be505ce79510e77b493fdded;hpb=209fa29602376e7d0de16f3a6f6dd3caf8af84b5;p=babeltrace.git

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index 16c7e0a1..a8c376f5 100644
--- 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);
@@ -107,13 +115,13 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
 			if (event) {
 				/* find the event id */
 				event_id_ptr = g_hash_table_lookup(stream->event_quark_to_id,
-						(gconstpointer) (unsigned long) event);
+						(gconstpointer) GUINT_TO_POINTER(event));
 				/* event not found in this stream class */
 				if (!event_id_ptr) {
 					fprintf(stderr, "[error] Event ID not found in stream class\n");
 					continue;
 				}
-				event_id = (uint64_t)(unsigned long) *event_id_ptr;
+				event_id = GPOINTER_TO_UINT(*event_id_ptr);
 
 				/* find or create the bt_callback_chain for this event */
 				if (event_id >= bt_stream_cb->per_id_callbacks->len) {
@@ -195,8 +203,6 @@ void process_callbacks(struct bt_ctf_iter *iter,
 	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:
@@ -223,8 +229,6 @@ void process_callbacks(struct bt_ctf_iter *iter,
 
 	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: