AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

server: Refactor array send functions

Browse Source 
These have grown a little in size but are almost identical, factor
out the common code.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Derek Foreman 2017-01-24 12:07:19 -06:00 committed by Pekka Paalanen
parent c44eed1c06
commit 5fbc9daa40
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/wayland-server.c
View File

@ -168,9 +168,10 @@ log_closure(struct wl_resource *resource,
}
}
WL_EXPORT void
wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode,
union wl_argument *args)
static void
handle_array(struct wl_resource *resource, uint32_t opcode,
union wl_argument *args,
int (*send_func)(struct wl_closure *, struct wl_connection *))
{
struct wl_closure *closure;
struct wl_object *object = &resource->object;
@ -183,7 +184,7 @@ wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode,
return;
}
if (wl_closure_send(closure, resource->client->connection))
if (send_func(closure, resource->client->connection))
resource->client->error = 1;
log_closure(resource, closure, true);
@ -191,6 +192,13 @@ wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode,
wl_closure_destroy(closure);
}
WL_EXPORT void
wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode,
union wl_argument *args)
{
handle_array(resource, opcode, args, wl_closure_send);
}
WL_EXPORT void
wl_resource_post_event(struct wl_resource *resource, uint32_t opcode, ...)
{
@ -211,23 +219,7 @@ WL_EXPORT void
wl_resource_queue_event_array(struct wl_resource *resource, uint32_t opcode,
union wl_argument *args)
{
struct wl_closure *closure;
struct wl_object *object = &resource->object;
closure = wl_closure_marshal(object, opcode, args,
&object->interface->events[opcode]);
if (closure == NULL) {
resource->client->error = 1;
return;
}
if (wl_closure_queue(closure, resource->client->connection))
resource->client->error = 1;
log_closure(resource, closure, true);
wl_closure_destroy(closure);
handle_array(resource, opcode, args, wl_closure_queue);
}
WL_EXPORT void