From 439b0a38630eb3c1a088c84cc76019ad001bb99b Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 18 Mar 2015 18:32:54 -0700 Subject: [PATCH] Spelling fixes (cosmetic) A few typos in comments and protocol docs, no code changes. ./src/wayland-util.h:281: recieved ==> received ./src/wayland-client.c:115: occured ==> occurred ./src/wayland-client.c:156: occured ==> occurred ./tests/test-compositor.c:76: parallely ==> parallelly ./tests/test-compositor.c:474: recieve ==> receive ./protocol/wayland.xml:1767: layed ==> laid ./protocol/wayland.xml:2112: dependant ==> dependent ./doc/publican/sources/Client.xml:25: recieved ==> received Signed-off-by: Bryce Harrington Reviewed-by: Bill Spitzak --- doc/publican/sources/Client.xml | 2 +- protocol/wayland.xml | 4 ++-- src/wayland-client.c | 4 ++-- src/wayland-util.h | 2 +- tests/test-compositor.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/publican/sources/Client.xml b/doc/publican/sources/Client.xml index a1e33419..fcdd2f2f 100644 --- a/doc/publican/sources/Client.xml +++ b/doc/publican/sources/Client.xml @@ -22,7 +22,7 @@ created and manages each open connection to a server. At least one wl_event_queue object is created for each wl_display, this holds events as they - are recieved from the server until they can be + are received from the server until they can be processed. Multi-threading is supported by creating an additional wl_event_queue for each additional thread, each object can have it's events placed in a particular queue, so potentially a diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 88bbbc04..041e5f09 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -1764,7 +1764,7 @@ This enumeration describes how the physical - pixels on an output are layed out. + pixels on an output are laid out. @@ -2113,7 +2113,7 @@ Change the commit behaviour of the sub-surface to synchronized - mode, also described as the parent dependant mode. + mode, also described as the parent dependent mode. In synchronized mode, wl_surface.commit on a sub-surface will accumulate the committed state in a cache, but the state will diff --git a/src/wayland-client.c b/src/wayland-client.c index 9adde385..ed108e1f 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -112,7 +112,7 @@ static int debug_client = 0; /** * This helper function wakes up all threads that are * waiting for display->reader_cond (i. e. when reading is done, - * canceled, or an error occured) + * canceled, or an error occurred) * * NOTE: must be called with display->mutex locked */ @@ -153,7 +153,7 @@ display_fatal_error(struct wl_display *display, int error) /** * This function is called for error events - * and indicates that in some object an error occured. + * and indicates that in some object an error occurred. * Difference between this function and display_fatal_error() * is that this one handles errors that will come by wire, * whereas display_fatal_error() is called for local errors. diff --git a/src/wayland-util.h b/src/wayland-util.h index a4b22b54..2bc3ff5a 100644 --- a/src/wayland-util.h +++ b/src/wayland-util.h @@ -278,7 +278,7 @@ union wl_argument { * object on which the callback is being invoked (either wl_proxy or * wl_resource). The third and fourth arguments are the opcode the wl_messsage * structure corresponding to the callback being emitted. The final argument - * is an array of arguments recieved from the other process via the wire + * is an array of arguments received from the other process via the wire * protocol. */ typedef int (*wl_dispatcher_func_t)(const void *, void *, uint32_t, diff --git a/tests/test-compositor.c b/tests/test-compositor.c index da2a55fd..89c41407 100644 --- a/tests/test-compositor.c +++ b/tests/test-compositor.c @@ -73,7 +73,7 @@ enum { DISPLAY_RESUMED = 0 }; -/* Since tests can run parallely, we need unique socket names +/* Since tests can run parallelly, we need unique socket names * for each test, otherwise the test can fail on wl_display_add_socket. */ static const char * get_socket_name(void) @@ -471,7 +471,7 @@ client_disconnect(struct client *c) } /* num is number of clients that requests to stop display. - * Display is stopped after it recieve num STOP_DISPLAY requests */ + * Display is stopped after it receive num STOP_DISPLAY requests */ int stop_display(struct client *c, int num) {