[RFC wayland 4/4] Add null dispatchers to test objects

Jason Ekstrand jason at jlekstrand.net
Wed Feb 27 19:29:58 PST 2013


Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
---
 tests/connection-test.c  | 12 ++++++------
 tests/os-wrappers-test.c |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/connection-test.c b/tests/connection-test.c
index 0f6667b..fb0111b 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -156,7 +156,7 @@ marshal(struct marshal_data *data, const char *format, int size, ...)
 {
 	struct wl_closure *closure;
 	static const uint32_t opcode = 4444;
-	static struct wl_object sender = { NULL, NULL, 1234 };
+	static struct wl_object sender = { NULL, NULL, 1234, NULL };
 	struct wl_message message = { "test", format, NULL };
 	va_list ap;
 
@@ -327,7 +327,7 @@ demarshal(struct marshal_data *data, const char *format,
 	struct wl_message message = { "test", format, NULL };
 	struct wl_closure *closure;
 	struct wl_map objects;
-	struct wl_object object = { NULL, &func, 0 };
+	struct wl_object object = { NULL, &func, 0, NULL };
 	int size = msg[1];
 
 	assert(write(data->s[1], msg, size) == size);
@@ -396,10 +396,10 @@ marshal_demarshal(struct marshal_data *data,
 {
 	struct wl_closure *closure;
 	static const int opcode = 4444;
-	static struct wl_object sender = { NULL, NULL, 1234 };
+	static struct wl_object sender = { NULL, NULL, 1234, NULL };
 	struct wl_message message = { "test", format, NULL };
 	struct wl_map objects;
-	struct wl_object object = { NULL, &func, 0 };
+	struct wl_object object = { NULL, &func, 0, NULL };
 	va_list ap;
 	uint32_t msg[1] = { 1234 };
 
@@ -493,8 +493,8 @@ static void
 marshal_helper(const char *format, void *handler, ...)
 {
 	struct wl_closure *closure;
-	static struct wl_object sender = { NULL, NULL, 1234 };
-	struct wl_object object = { NULL, &handler, 0 };
+	static struct wl_object sender = { NULL, NULL, 1234, NULL };
+	struct wl_object object = { NULL, &handler, 0, NULL };
 	static const int opcode = 4444;
 	struct wl_message message = { "test", format, NULL };
 	va_list ap;
diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c
index cdbe199..2d398ef 100644
--- a/tests/os-wrappers-test.c
+++ b/tests/os-wrappers-test.c
@@ -230,10 +230,10 @@ marshal_demarshal(struct marshal_data *data,
 {
 	struct wl_closure *closure;
 	static const int opcode = 4444;
-	static struct wl_object sender = { NULL, NULL, 1234 };
+	static struct wl_object sender = { NULL, NULL, 1234, NULL };
 	struct wl_message message = { "test", format, NULL };
 	struct wl_map objects;
-	struct wl_object object = { NULL, &func, 1234 };
+	struct wl_object object = { NULL, &func, 1234, NULL };
 	va_list ap;
 	uint32_t msg[1] = { 1234 };
 
-- 
1.8.1.2



More information about the wayland-devel mailing list