X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fdmesg%2Fdmesg.c;h=a17f969e9999c59aa852978cbe4e4adcdf345b2a;hb=fe7265b50927fe05576f8c5cedaea1d8433d8a02;hp=f8f65541b8ce148c9eb572359924e9cde49566e7;hpb=a19804e742baa94691303e48e4e41bc0a4a8d917;p=babeltrace.git diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index f8f65541..a17f969e 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -1039,7 +1039,7 @@ void destroy_dmesg_notif_iter(struct dmesg_notif_iter *dmesg_notif_iter) BT_HIDDEN enum bt_notification_iterator_status dmesg_notif_iter_init( - struct bt_private_notification_iterator *priv_notif_iter, + struct bt_private_connection_private_notification_iterator *priv_notif_iter, struct bt_private_port *priv_port) { struct bt_private_component *priv_comp = NULL; @@ -1054,7 +1054,7 @@ enum bt_notification_iterator_status dmesg_notif_iter_init( goto error; } - priv_comp = bt_private_notification_iterator_get_private_component( + priv_comp = bt_private_connection_private_notification_iterator_get_private_component( priv_notif_iter); assert(priv_comp); dmesg_comp = bt_private_component_get_user_data(priv_comp); @@ -1072,13 +1072,13 @@ enum bt_notification_iterator_status dmesg_notif_iter_init( } } - (void) bt_private_notification_iterator_set_user_data(priv_notif_iter, + (void) bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter, dmesg_notif_iter); goto end; error: destroy_dmesg_notif_iter(dmesg_notif_iter); - (void) bt_private_notification_iterator_set_user_data(priv_notif_iter, + (void) bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter, NULL); if (status >= 0) { status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; @@ -1091,22 +1091,22 @@ end: BT_HIDDEN void dmesg_notif_iter_finalize( - struct bt_private_notification_iterator *priv_notif_iter) + struct bt_private_connection_private_notification_iterator *priv_notif_iter) { - destroy_dmesg_notif_iter(bt_private_notification_iterator_get_user_data( + destroy_dmesg_notif_iter(bt_private_connection_private_notification_iterator_get_user_data( priv_notif_iter)); } BT_HIDDEN -struct bt_notification_iterator_next_return dmesg_notif_iter_next( - struct bt_private_notification_iterator *priv_notif_iter) +struct bt_notification_iterator_next_method_return dmesg_notif_iter_next( + struct bt_private_connection_private_notification_iterator *priv_notif_iter) { ssize_t len; struct dmesg_notif_iter *dmesg_notif_iter = - bt_private_notification_iterator_get_user_data( + bt_private_connection_private_notification_iterator_get_user_data( priv_notif_iter); struct dmesg_component *dmesg_comp; - struct bt_notification_iterator_next_return next_ret = { + struct bt_notification_iterator_next_method_return next_ret = { .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, .notification = NULL };