mirror of
				https://gitlab.freedesktop.org/wayland/wayland.git
				synced 2025-11-03 09:01:42 -05:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									a2c79b14a1
								
							
						
					
					
						commit
						efe23443d8
					
				
					 2 changed files with 13 additions and 7 deletions
				
			
		| 
						 | 
					@ -404,12 +404,7 @@ wl_connection_put_fd(struct wl_connection *connection, int32_t fd)
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct argument_details {
 | 
					const char *
 | 
				
			||||||
	char type;
 | 
					 | 
				
			||||||
	int nullable;
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static const char *
 | 
					 | 
				
			||||||
get_next_argument(const char *signature, struct argument_details *details)
 | 
					get_next_argument(const char *signature, struct argument_details *details)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (*signature == '?') {
 | 
						if (*signature == '?') {
 | 
				
			||||||
| 
						 | 
					@ -422,7 +417,7 @@ get_next_argument(const char *signature, struct argument_details *details)
 | 
				
			||||||
	return signature + 1;
 | 
						return signature + 1;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int
 | 
					int
 | 
				
			||||||
arg_count_for_signature(const char *signature)
 | 
					arg_count_for_signature(const char *signature)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int count = 0;
 | 
						int count = 0;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -81,6 +81,17 @@ struct wl_closure {
 | 
				
			||||||
	uint32_t buffer[0];
 | 
						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 *
 | 
					struct wl_closure *
 | 
				
			||||||
wl_closure_vmarshal(struct wl_object *sender,
 | 
					wl_closure_vmarshal(struct wl_object *sender,
 | 
				
			||||||
		    uint32_t opcode, va_list ap,
 | 
							    uint32_t opcode, va_list ap,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue