cosmetic: fix inconsistent code style with header prototypes.

A few of the header files had function prototypes that were not
following project conventions, sometimes even in the same file.
Corrected these to follow as per wayland-os.h.

Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>

1 files changed, 106 insertions, 46 deletions

diff --git a/src/wayland-client-core.h b/src/wayland-client-core.h
index dea70d9..8b4b4b8 100644
--- a/src/wayland-client-core.h
+++ b/src/wayland-client-core.h
@@ -118,63 +118,123 @@ struct wl_display;
  */
 struct wl_event_queue;
 
-void wl_event_queue_destroy(struct wl_event_queue *queue);
+void
+wl_event_queue_destroy(struct wl_event_queue *queue);
+
+void
+wl_proxy_marshal(struct wl_proxy *p, uint32_t opcode, ...);
+
+void
+wl_proxy_marshal_array(struct wl_proxy *p, uint32_t opcode,
+		       union wl_argument *args);
+
+struct wl_proxy *
+wl_proxy_create(struct wl_proxy *factory,
+		const struct wl_interface *interface);
+
+struct wl_proxy *
+wl_proxy_marshal_constructor(struct wl_proxy *proxy,
+			     uint32_t opcode,
+			     const struct wl_interface *interface,
+			     ...);
 
-void wl_proxy_marshal(struct wl_proxy *p, uint32_t opcode, ...);
-void wl_proxy_marshal_array(struct wl_proxy *p, uint32_t opcode,
-			    union wl_argument *args);
-struct wl_proxy *wl_proxy_create(struct wl_proxy *factory,
-				 const struct wl_interface *interface);
-struct wl_proxy *wl_proxy_marshal_constructor(struct wl_proxy *proxy,
-					      uint32_t opcode,
-					      const struct wl_interface *interface,
-					      ...);
 struct wl_proxy *
 wl_proxy_marshal_array_constructor(struct wl_proxy *proxy,
 				   uint32_t opcode, union wl_argument *args,
 				   const struct wl_interface *interface);
 
-void wl_proxy_destroy(struct wl_proxy *proxy);
-int wl_proxy_add_listener(struct wl_proxy *proxy,
-			  void (**implementation)(void), void *data);
-const void *wl_proxy_get_listener(struct wl_proxy *proxy);
-int wl_proxy_add_dispatcher(struct wl_proxy *proxy,
-			    wl_dispatcher_func_t dispatcher_func,
-			    const void * dispatcher_data, void *data);
-void wl_proxy_set_user_data(struct wl_proxy *proxy, void *user_data);
-void *wl_proxy_get_user_data(struct wl_proxy *proxy);
-uint32_t wl_proxy_get_id(struct wl_proxy *proxy);
-const char *wl_proxy_get_class(struct wl_proxy *proxy);
-void wl_proxy_set_queue(struct wl_proxy *proxy, struct wl_event_queue *queue);
+void
+wl_proxy_destroy(struct wl_proxy *proxy);
 
-struct wl_display *wl_display_connect(const char *name);
-struct wl_display *wl_display_connect_to_fd(int fd);
-void wl_display_disconnect(struct wl_display *display);
-int wl_display_get_fd(struct wl_display *display);
-int wl_display_dispatch(struct wl_display *display);
-int wl_display_dispatch_queue(struct wl_display *display,
-			      struct wl_event_queue *queue);
-int wl_display_dispatch_queue_pending(struct wl_display *display,
-				      struct wl_event_queue *queue);
-int wl_display_dispatch_pending(struct wl_display *display);
-int wl_display_get_error(struct wl_display *display);
-uint32_t wl_display_get_protocol_error(struct wl_display *display,
-				       const struct wl_interface **interface,
-				       uint32_t *id);
+int
+wl_proxy_add_listener(struct wl_proxy *proxy,
+		      void (**implementation)(void), void *data);
+
+const void *
+wl_proxy_get_listener(struct wl_proxy *proxy);
+
+int
+wl_proxy_add_dispatcher(struct wl_proxy *proxy,
+			wl_dispatcher_func_t dispatcher_func,
+			const void * dispatcher_data, void *data);
+
+void
+wl_proxy_set_user_data(struct wl_proxy *proxy, void *user_data);
+
+void *
+wl_proxy_get_user_data(struct wl_proxy *proxy);
+
+uint32_t
+wl_proxy_get_id(struct wl_proxy *proxy);
+
+const char *
+wl_proxy_get_class(struct wl_proxy *proxy);
+
+void
+wl_proxy_set_queue(struct wl_proxy *proxy, struct wl_event_queue *queue);
+
+struct wl_display *
+wl_display_connect(const char *name);
+
+struct wl_display *
+wl_display_connect_to_fd(int fd);
 
-int wl_display_flush(struct wl_display *display);
-int wl_display_roundtrip_queue(struct wl_display *display,
-                               struct wl_event_queue *queue);
-int wl_display_roundtrip(struct wl_display *display);
-struct wl_event_queue *wl_display_create_queue(struct wl_display *display);
+void
+wl_display_disconnect(struct wl_display *display);
 
-int wl_display_prepare_read_queue(struct wl_display *display,
+int
+wl_display_get_fd(struct wl_display *display);
+
+int
+wl_display_dispatch(struct wl_display *display);
+
+int
+wl_display_dispatch_queue(struct wl_display *display,
+			  struct wl_event_queue *queue);
+
+int
+wl_display_dispatch_queue_pending(struct wl_display *display,
 				  struct wl_event_queue *queue);
-int wl_display_prepare_read(struct wl_display *display);
-void wl_display_cancel_read(struct wl_display *display);
-int wl_display_read_events(struct wl_display *display);
 
-void wl_log_set_handler_client(wl_log_func_t handler);
+int
+wl_display_dispatch_pending(struct wl_display *display);
+
+int
+wl_display_get_error(struct wl_display *display);
+
+uint32_t
+wl_display_get_protocol_error(struct wl_display *display,
+			      const struct wl_interface **interface,
+			      uint32_t *id);
+
+int
+wl_display_flush(struct wl_display *display);
+
+int
+wl_display_roundtrip_queue(struct wl_display *display,
+			   struct wl_event_queue *queue);
+
+int
+wl_display_roundtrip(struct wl_display *display);
+
+struct wl_event_queue *
+wl_display_create_queue(struct wl_display *display);
+
+int
+wl_display_prepare_read_queue(struct wl_display *display,
+			      struct wl_event_queue *queue);
+
+int
+wl_display_prepare_read(struct wl_display *display);
+
+void
+wl_display_cancel_read(struct wl_display *display);
+
+int
+wl_display_read_events(struct wl_display *display);
+
+void
+wl_log_set_handler_client(wl_log_func_t handler);
 
 #ifdef  __cplusplus
 }