diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-23 19:54:40 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-07-23 20:15:28 -0400 |
| commit | efe23443d8bcdad0513d5dd9d027233b3d7dc968 (patch) | |
| tree | 9dae21a6d2f099983a0eb8dc1c027434760522e3 /src | |
| parent | tests: Wrap calloc by just returning NULL if we're called too early (diff) | |
| download | wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.tar wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.tar.gz wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.tar.bz2 wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.tar.lz wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.tar.xz wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.tar.zst wayland-efe23443d8bcdad0513d5dd9d027233b3d7dc968.zip | |
Unstatic arg_count_for_signature and get_next_argument
Expose these to other files using wayland-private.h, so wayland-client.c
can walk NULLables properly.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/connection.c | 9 | ||||
| -rw-r--r-- | src/wayland-private.h | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/connection.c b/src/connection.c index f4f881e..b228c92 100644 --- a/src/connection.c +++ b/src/connection.c @@ -404,12 +404,7 @@ wl_connection_put_fd(struct wl_connection *connection, int32_t fd) return 0; } -struct argument_details { - char type; - int nullable; -}; - -static const char * +const char * get_next_argument(const char *signature, struct argument_details *details) { if (*signature == '?') { @@ -422,7 +417,7 @@ get_next_argument(const char *signature, struct argument_details *details) return signature + 1; } -static int +int arg_count_for_signature(const char *signature) { int count = 0; diff --git a/src/wayland-private.h b/src/wayland-private.h index 2113d83..f9fcc96 100644 --- a/src/wayland-private.h +++ b/src/wayland-private.h @@ -81,6 +81,17 @@ struct wl_closure { uint32_t buffer[0]; }; +struct argument_details { + char type; + int nullable; +}; + +const char * +get_next_argument(const char *signature, struct argument_details *details); + +int +arg_count_for_signature(const char *signature); + struct wl_closure * wl_closure_vmarshal(struct wl_object *sender, uint32_t opcode, va_list ap, |