From efe23443d8bcdad0513d5dd9d027233b3d7dc968 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 23 Jul 2012 19:54:40 +0100 Subject: [PATCH] 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 --- src/connection.c | 9 ++------- 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, -- 2.7.4