mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use wl_container_of() instead of casts

Browse source 
This slightly improves type safety.

The culprits were found with:

    git grep -E '\([a-z0-9_ ]+ \*\)\W?[a-z]'
This commit is contained in:
Simon Ser 2023-07-11 17:54:08 +02:00
parent c2c536de03
commit fe06e5f49a
29 changed files with 85 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/drm/backend.c
View file

@ -16,7 +16,8 @@
struct wlr_drm_backend *get_drm_backend_from_backend(
struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_drm(wlr_backend));
return (struct wlr_drm_backend *)wlr_backend;
struct wlr_drm_backend *backend = wl_container_of(wlr_backend, backend, backend);
return backend;
}
static bool backend_start(struct wlr_backend *backend) {

3
backend/drm/drm.c
View file

@ -331,7 +331,8 @@ void finish_drm_resources(struct wlr_drm_backend *drm) {
static struct wlr_drm_connector *get_drm_connector_from_output(
struct wlr_output *wlr_output) {
assert(wlr_output_is_drm(wlr_output));
return (struct wlr_drm_connector *)wlr_output;
struct wlr_drm_connector *conn = wl_container_of(wlr_output, conn, output);
return conn;
}
static void layer_handle_addon_destroy(struct wlr_addon *addon) {

3
backend/headless/backend.c
View file

@ -7,7 +7,8 @@
struct wlr_headless_backend *headless_backend_from_backend(
struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_headless(wlr_backend));
return (struct wlr_headless_backend *)wlr_backend;
struct wlr_headless_backend *backend = wl_container_of(wlr_backend, backend, backend);
return backend;
}
static bool backend_start(struct wlr_backend *wlr_backend) {

3
backend/headless/output.c
View file

@ -17,7 +17,8 @@ static size_t last_output_num = 0;
static struct wlr_headless_output *headless_output_from_output(
struct wlr_output *wlr_output) {
assert(wlr_output_is_headless(wlr_output));
return (struct wlr_headless_output *)wlr_output;
struct wlr_headless_output *output = wl_container_of(wlr_output, output, wlr_output);
return output;
}
static bool output_set_custom_mode(struct wlr_headless_output *output,

3
backend/libinput/backend.c
View file

@ -11,7 +11,8 @@
static struct wlr_libinput_backend *get_libinput_backend_from_backend(
struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_libinput(wlr_backend));
return (struct wlr_libinput_backend *)wlr_backend;
struct wlr_libinput_backend *backend = wl_container_of(wlr_backend, backend, backend);
return backend;
}
static int libinput_open_restricted(const char *path,

3
backend/multi/backend.c
View file

@ -21,7 +21,8 @@ struct subbackend_state {
static struct wlr_multi_backend *multi_backend_from_backend(
struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_multi(wlr_backend));
return (struct wlr_multi_backend *)wlr_backend;
struct wlr_multi_backend *backend = wl_container_of(wlr_backend, backend, backend);
return backend;
}
static bool multi_backend_start(struct wlr_backend *wlr_backend) {

7
backend/wayland/backend.c
View file

@ -46,9 +46,10 @@ struct wlr_wl_linux_dmabuf_v1_table_entry {
uint64_t modifier;
};
struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *backend) {
assert(wlr_backend_is_wl(backend));
return (struct wlr_wl_backend *)backend;
struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_wl(wlr_backend));
struct wlr_wl_backend *backend = wl_container_of(wlr_backend, backend, backend);
return backend;
}
static int dispatch_events(int fd, uint32_t mask, void *data) {

3
backend/wayland/output.c
View file

@ -39,7 +39,8 @@ static size_t last_output_num = 0;
static struct wlr_wl_output *get_wl_output_from_output(
struct wlr_output *wlr_output) {
assert(wlr_output_is_wl(wlr_output));
return (struct wlr_wl_output *)wlr_output;
struct wlr_wl_output *output = wl_container_of(wlr_output, output, wlr_output);
return output;
}
static void surface_frame_callback(void *data, struct wl_callback *cb,

3
backend/x11/backend.c
View file

@ -154,7 +154,8 @@ static int x11_event(int fd, uint32_t mask, void *data) {
struct wlr_x11_backend *get_x11_backend_from_backend(
struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_x11(wlr_backend));
return (struct wlr_x11_backend *)wlr_backend;
struct wlr_x11_backend *backend = wl_container_of(wlr_backend, backend, backend);
return backend;
}
static bool backend_start(struct wlr_backend *backend) {

3
backend/x11/output.c
View file

@ -54,7 +54,8 @@ static void parse_xcb_setup(struct wlr_output *output,
static struct wlr_x11_output *get_x11_output_from_output(
struct wlr_output *wlr_output) {
assert(wlr_output_is_x11(wlr_output));
return (struct wlr_x11_output *)wlr_output;
struct wlr_x11_output *output = wl_container_of(wlr_output, output, wlr_output);
return output;
}
static bool output_set_custom_mode(struct wlr_output *wlr_output,