summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2024-01-30 19:04:17 -0500
committerMarius Vlad <marius.vlad@collabora.com>2024-03-11 19:59:17 +0200
commit0ca7f35ae449428e7c2bd969d20a88f03de442bc (patch)
tree18bb890b92422f8fe2a4f423627bb2dc98362023
parent48124d46cd8cc2e0cf68805afdb7cea2c12895c2 (diff)
src: weston_process renamed to wet_process
Also, wet_process.cleanup now takes extra data argument. Bug-AGL: SPEC-5061 Change-Id: I2e7e6d976663a41d0a53866d6bde4df0531f1790 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
-rw-r--r--src/shell.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shell.c b/src/shell.c
index 9b17353..a6c8a5b 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -803,9 +803,9 @@ ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource
static struct wl_client *
client_launch(struct weston_compositor *compositor,
- struct weston_process *proc,
+ struct wet_process *proc,
const char *path,
- weston_process_cleanup_func_t cleanup)
+ wet_process_cleanup_func_t cleanup)
{
struct wl_client *client = NULL;
struct custom_env child_env;
@@ -910,14 +910,14 @@ client_launch(struct weston_compositor *compositor,
}
struct process_info {
- struct weston_process proc;
+ struct wet_process proc;
char *path;
};
int
sigchld_handler(int signal_number, void *data)
{
- struct weston_process *p;
+ struct wet_process *p;
struct ivi_compositor *ivi = data;
int status;
pid_t pid;
@@ -935,7 +935,7 @@ sigchld_handler(int signal_number, void *data)
wl_list_remove(&p->link);
wl_list_init(&p->link);
- p->cleanup(p, status);
+ p->cleanup(p, status, NULL);
}
if (pid < 0 && errno != ECHILD)
@@ -946,7 +946,7 @@ sigchld_handler(int signal_number, void *data)
static void
-process_handle_sigchld(struct weston_process *process, int status)
+process_handle_sigchld(struct wet_process *process, int status, void *data)
{
struct process_info *pinfo =
container_of(process, struct process_info, proc);