From 4326d3c768af4d8f1ebf06f9027b2de932516ed8 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 18 Apr 2023 13:29:44 +0100 Subject: [PATCH] frontend: Rename weston_process to wet_process It's not a libweston thing, it's a part of the frontend. Signed-off-by: Daniel Stone --- compositor/main.c | 12 ++++++------ compositor/weston.h | 16 ++++++++-------- compositor/xwayland.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/compositor/main.c b/compositor/main.c index ccf48de8..81640736 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -337,7 +337,7 @@ to_wet_compositor(struct weston_compositor *compositor) static int sigchld_handler(int signal_number, void *data) { - struct weston_process *p; + struct wet_process *p; struct wet_compositor *wet = data; int status; pid_t pid; @@ -390,11 +390,11 @@ cleanup_for_child_process() { WL_EXPORT bool weston_client_launch(struct weston_compositor *compositor, - struct weston_process *proc, + struct wet_process *proc, struct custom_env *child_env, int *no_cloexec_fds, size_t num_no_cloexec_fds, - weston_process_cleanup_func_t cleanup) + wet_process_cleanup_func_t cleanup) { const char *fail_cloexec = "Couldn't unset CLOEXEC on child FDs"; const char *fail_seteuid = "Couldn't call seteuid"; @@ -464,14 +464,14 @@ weston_client_launch(struct weston_compositor *compositor, WL_EXPORT void wet_watch_process(struct weston_compositor *compositor, - struct weston_process *process) + struct wet_process *process) { struct wet_compositor *wet = to_wet_compositor(compositor); wl_list_insert(&wet->child_process_list, &process->link); } static void -process_handle_sigchld(struct weston_process *process, int status) +process_handle_sigchld(struct wet_process *process, int status) { /* * There are no guarantees whether this runs before or after @@ -494,7 +494,7 @@ process_handle_sigchld(struct weston_process *process, int status) WL_EXPORT struct wl_client * weston_client_start(struct weston_compositor *compositor, const char *path) { - struct weston_process *proc; + struct wet_process *proc; struct wl_client *client; struct custom_env child_env; struct fdstr wayland_socket = FDSTR_INIT; diff --git a/compositor/weston.h b/compositor/weston.h index 5d0de592..7608546a 100644 --- a/compositor/weston.h +++ b/compositor/weston.h @@ -36,14 +36,14 @@ extern "C" { void screenshooter_create(struct weston_compositor *ec); -struct weston_process; -typedef void (*weston_process_cleanup_func_t)(struct weston_process *process, - int status); +struct wet_process; +typedef void (*wet_process_cleanup_func_t)(struct wet_process *process, + int status); -struct weston_process { +struct wet_process { pid_t pid; char *path; - weston_process_cleanup_func_t cleanup; + wet_process_cleanup_func_t cleanup; struct wl_list link; }; @@ -51,18 +51,18 @@ struct custom_env; bool weston_client_launch(struct weston_compositor *compositor, - struct weston_process *proc, + struct wet_process *proc, struct custom_env *custom_env, int *fds_no_cloexec, size_t num_fds_no_cloexec, - weston_process_cleanup_func_t cleanup); + wet_process_cleanup_func_t cleanup); struct wl_client * weston_client_start(struct weston_compositor *compositor, const char *path); void wet_watch_process(struct weston_compositor *compositor, - struct weston_process *process); + struct wet_process *process); struct weston_config * wet_get_config(struct weston_compositor *compositor); diff --git a/compositor/xwayland.c b/compositor/xwayland.c index 44f02016..78a26641 100644 --- a/compositor/xwayland.c +++ b/compositor/xwayland.c @@ -54,7 +54,7 @@ struct wet_xwayland { struct wl_event_source *display_fd_source; struct wl_client *client; int wm_fd; - struct weston_process process; + struct wet_process process; }; static int @@ -92,7 +92,7 @@ out: } static void -xserver_cleanup(struct weston_process *process, int status) +xserver_cleanup(struct wet_process *process, int status) { struct wet_xwayland *wxw = container_of(process, struct wet_xwayland, process);