From 12af425acd3f4a3a8aa85352857b130b0006b83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 25 Jun 2020 17:56:41 +0200 Subject: [PATCH] =?UTF-8?q?xwayland:=20Rename=20xwl=5Fpixmap=5Fcb=20?= =?UTF-8?q?=E2=86=92=20xwl=5Fbuffer=5Frelease=5Fcb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems clearer. While we're at it, also drop the unused pixmap parameter. Reviewed-by: Olivier Fourdan --- hw/xwayland/xwayland-pixmap.c | 6 +++--- hw/xwayland/xwayland-pixmap.h | 4 ++-- hw/xwayland/xwayland-present.c | 2 +- hw/xwayland/xwayland-window-buffers.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/xwayland/xwayland-pixmap.c b/hw/xwayland/xwayland-pixmap.c index fef6fa4cf..6e797a34c 100644 --- a/hw/xwayland/xwayland-pixmap.c +++ b/hw/xwayland/xwayland-pixmap.c @@ -41,7 +41,7 @@ static DevPrivateKeyRec xwl_pixmap_private_key; static DevPrivateKeyRec xwl_pixmap_cb_private_key; struct xwl_pixmap_buffer_release_callback { - xwl_pixmap_cb callback; + xwl_buffer_release_cb callback; void *data; }; @@ -59,7 +59,7 @@ xwl_pixmap_get(PixmapPtr pixmap) Bool xwl_pixmap_set_buffer_release_cb(PixmapPtr pixmap, - xwl_pixmap_cb func, void *data) + xwl_buffer_release_cb func, void *data) { struct xwl_pixmap_buffer_release_callback *xwl_pixmap_buffer_release_callback; @@ -107,7 +107,7 @@ xwl_pixmap_buffer_release_cb(void *data, struct wl_buffer *wl_buffer) &xwl_pixmap_cb_private_key); if (xwl_pixmap_buffer_release_callback) (*xwl_pixmap_buffer_release_callback->callback) - (pixmap, xwl_pixmap_buffer_release_callback->data); + (xwl_pixmap_buffer_release_callback->data); } Bool diff --git a/hw/xwayland/xwayland-pixmap.h b/hw/xwayland/xwayland-pixmap.h index 9b926b507..06ee4898a 100644 --- a/hw/xwayland/xwayland-pixmap.h +++ b/hw/xwayland/xwayland-pixmap.h @@ -34,12 +34,12 @@ /* This is an opaque structure implemented in the different backends */ struct xwl_pixmap; -typedef void (*xwl_pixmap_cb) (PixmapPtr pixmap, void *data); +typedef void (*xwl_buffer_release_cb) (void *data); void xwl_pixmap_set_private(PixmapPtr pixmap, struct xwl_pixmap *xwl_pixmap); struct xwl_pixmap *xwl_pixmap_get(PixmapPtr pixmap); Bool xwl_pixmap_set_buffer_release_cb(PixmapPtr pixmap, - xwl_pixmap_cb func, void *data); + xwl_buffer_release_cb func, void *data); void xwl_pixmap_del_buffer_release_cb(PixmapPtr pixmap); void xwl_pixmap_buffer_release_cb(void *data, struct wl_buffer *wl_buffer); Bool xwl_pixmap_init(void); diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c index 4db068109..a5326d916 100644 --- a/hw/xwayland/xwayland-present.c +++ b/hw/xwayland/xwayland-present.c @@ -176,7 +176,7 @@ xwl_present_cleanup(WindowPtr window) } static void -xwl_present_buffer_release(PixmapPtr pixmap, void *data) +xwl_present_buffer_release(void *data) { struct xwl_present_event *event = data; diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c index ff9ed57db..d1ae8774f 100644 --- a/hw/xwayland/xwayland-window-buffers.c +++ b/hw/xwayland/xwayland-window-buffers.c @@ -181,7 +181,7 @@ xwl_window_buffer_timer_callback(OsTimerPtr timer, CARD32 time, void *arg) } static void -xwl_window_buffer_release_callback(PixmapPtr pixmap, void *data) +xwl_window_buffer_release_callback(void *data) { struct xwl_window_buffer *xwl_window_buffer = data; struct xwl_window *xwl_window = xwl_window_buffer->xwl_window;