mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename global 'func' to 'bind'

Browse source
This commit is contained in:
Kristian Høgsberg 2011-08-19 11:05:01 -04:00
parent e8a192ca61
commit 84c13ab810
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/wayland-server.c
View file

@ -81,7 +81,7 @@ struct wl_display {
struct wl_global { struct wl_global {
struct wl_object *object; struct wl_object *object;
wl_global_bind_func_t func; wl_global_bind_func_t bind;
struct wl_list link; struct wl_list link;
}; };
@ -547,8 +547,8 @@ display_bind(struct wl_client *client,
wl_client_post_error(client, &client->display->resource.object, wl_client_post_error(client, &client->display->resource.object,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
"invalid object %d", id); "invalid object %d", id);
else if (global->func) else if (global->bind)
global->func(client, global->object, version); global->bind(client, global->object, version);
} }
static void static void
@ -652,7 +652,7 @@ wl_display_add_object(struct wl_display *display, struct wl_object *object)
WL_EXPORT int WL_EXPORT int
wl_display_add_global(struct wl_display *display, wl_display_add_global(struct wl_display *display,
struct wl_object *object, wl_global_bind_func_t func) struct wl_object *object, wl_global_bind_func_t bind)
{ {
struct wl_global *global; struct wl_global *global;
@ -661,7 +661,7 @@ wl_display_add_global(struct wl_display *display,
return -1; return -1;
global->object = object; global->object = object;
global->func = func; global->bind = bind;
wl_list_insert(display->global_list.prev, &global->link); wl_list_insert(display->global_list.prev, &global->link);
return 0; return 0;

2
src/wayland-server.h
View file

@ -91,7 +91,7 @@ typedef void (*wl_global_bind_func_t)(struct wl_client *client,
int wl_display_add_global(struct wl_display *display, int wl_display_add_global(struct wl_display *display,
struct wl_object *object, struct wl_object *object,
wl_global_bind_func_t func); wl_global_bind_func_t bind);
int wl_display_remove_global(struct wl_display *display, int wl_display_remove_global(struct wl_display *display,
struct wl_object *object); struct wl_object *object);