3 files changed, 9 insertions, 9 deletions

diff --git a/xwayland/selection/incoming.c b/xwayland/selection/incoming.c
index ab06f40d..1b596254 100644
--- a/xwayland/selection/incoming.c
+++ b/xwayland/selection/incoming.c
@@ -31,7 +31,7 @@ static int xwm_data_source_write(int fd, uint32_t mask, void *data) {
 		return 1;
 	}
 
-	wlr_log(L_DEBUG, "wrote %ld (chunk size %ld) of %d bytes",
+	wlr_log(L_DEBUG, "wrote %zd (chunk size %zd) of %d bytes",
 		transfer->property_start + len,
 		len, xcb_get_property_value_length(transfer->property_reply));
 
@@ -182,14 +182,14 @@ struct x11_data_source {
 
 static const struct wlr_data_source_impl data_source_impl;
 
-bool wlr_data_source_is_xwayland_data_source(
+bool data_source_is_xwayland(
 		struct wlr_data_source *wlr_source) {
 	return wlr_source->impl == &data_source_impl;
 }
 
 static struct x11_data_source *data_source_from_wlr_data_source(
 		struct wlr_data_source *wlr_source) {
-	assert(wlr_data_source_is_xwayland_data_source(wlr_source));
+	assert(data_source_is_xwayland(wlr_source));
 	return (struct x11_data_source *)wlr_source;
 }
 
@@ -225,7 +225,7 @@ struct x11_primary_selection_source {
 static void primary_selection_source_cancel(
 	struct wlr_primary_selection_source *wlr_source);
 
-bool wlr_primary_selection_source_is_xwayland_primary_selection_source(
+bool primary_selection_source_is_xwayland(
 		struct wlr_primary_selection_source *wlr_source) {
 	return wlr_source->cancel == primary_selection_source_cancel;
 }
diff --git a/xwayland/selection/outgoing.c b/xwayland/selection/outgoing.c
index b612b2fb..6d7565e3 100644
--- a/xwayland/selection/outgoing.c
+++ b/xwayland/selection/outgoing.c
@@ -96,7 +96,7 @@ static int xwm_data_source_read(int fd, uint32_t mask, void *data) {
 		goto error_out;
 	}
 
-	wlr_log(L_DEBUG, "read %ld bytes (available %zu, mask 0x%x)", len,
+	wlr_log(L_DEBUG, "read %zd bytes (available %zu, mask 0x%x)", len,
 		available, mask);
 
 	transfer->source_data.size = current + len;
diff --git a/xwayland/selection/selection.c b/xwayland/selection/selection.c
index 39c47c45..6b57f7c3 100644
--- a/xwayland/selection/selection.c
+++ b/xwayland/selection/selection.c
@@ -223,13 +223,13 @@ void xwm_selection_finish(struct wlr_xwm *xwm) {
 	}
 	if (xwm->seat) {
 		if (xwm->seat->selection_source &&
-				wlr_data_source_is_xwayland_data_source(
+				data_source_is_xwayland(
 					xwm->seat->selection_source)) {
 			wlr_seat_set_selection(xwm->seat, NULL,
 				wl_display_next_serial(xwm->xwayland->wl_display));
 		}
 		if (xwm->seat->primary_selection_source &&
-				wlr_primary_selection_source_is_xwayland_primary_selection_source(
+				primary_selection_source_is_xwayland(
 					xwm->seat->primary_selection_source)) {
 			wlr_seat_set_primary_selection(xwm->seat, NULL,
 				wl_display_next_serial(xwm->xwayland->wl_display));
@@ -262,7 +262,7 @@ static void seat_handle_selection(struct wl_listener *listener,
 		wl_container_of(listener, xwm, seat_selection);
 	struct wlr_data_source *source = seat->selection_source;
 
-	if (source != NULL && wlr_data_source_is_xwayland_data_source(source)) {
+	if (source != NULL && data_source_is_xwayland(source)) {
 		return;
 	}
 
@@ -277,7 +277,7 @@ static void seat_handle_primary_selection(struct wl_listener *listener,
 	struct wlr_primary_selection_source *source = seat->primary_selection_source;
 
 	if (source != NULL &&
-			wlr_primary_selection_source_is_xwayland_primary_selection_source(
+			primary_selection_source_is_xwayland(
 				source)) {
 		return;
 	}