cleanup:global:Use astyle to reformat everything

1 files changed, 52 insertions, 63 deletions

diff --git a/navit/event.c b/navit/event.c
index 313680f4e..526e664f3 100644
--- a/navit/event.c
+++ b/navit/event.c
@@ -44,37 +44,32 @@ static int has_quit;
 		return r;\
 	}
 
-void event_main_loop_run(void)
-{
-	require_method(main_loop_run);
-	event_methods.main_loop_run();
+void event_main_loop_run(void) {
+    require_method(main_loop_run);
+    event_methods.main_loop_run();
 }
 
-void event_main_loop_quit(void)
-{
-	if (event_methods.main_loop_quit)
-		event_methods.main_loop_quit();
-	has_quit=1;
+void event_main_loop_quit(void) {
+    if (event_methods.main_loop_quit)
+        event_methods.main_loop_quit();
+    has_quit=1;
 }
 
 int
-event_main_loop_has_quit(void)
-{
-	return has_quit;
+event_main_loop_has_quit(void) {
+    return has_quit;
 }
 
 struct event_watch *
-event_add_watch(int fd, enum event_watch_cond cond, struct callback *cb)
-{
-	require_method2(add_watch, NULL);
-	return event_methods.add_watch(fd, cond, cb);
+event_add_watch(int fd, enum event_watch_cond cond, struct callback *cb) {
+    require_method2(add_watch, NULL);
+    return event_methods.add_watch(fd, cond, cb);
 }
 
 void
-event_remove_watch(struct event_watch *ev)
-{
-	require_method(remove_watch);
-	event_methods.remove_watch(ev);
+event_remove_watch(struct event_watch *ev) {
+    require_method(remove_watch);
+    event_methods.remove_watch(ev);
 }
 
 /**
@@ -87,67 +82,61 @@ event_remove_watch(struct event_watch *ev)
  * @returns the result of the event_methods.add_timeout() call
  */
 struct event_timeout *
-event_add_timeout(int timeout, int multi, struct callback *cb)
-{
-	require_method2(add_timeout, NULL);
-	return event_methods.add_timeout(timeout, multi, cb);
+event_add_timeout(int timeout, int multi, struct callback *cb) {
+    require_method2(add_timeout, NULL);
+    return event_methods.add_timeout(timeout, multi, cb);
 }
 
 void
-event_remove_timeout(struct event_timeout *ev)
-{
-	require_method(remove_timeout);
-	event_methods.remove_timeout(ev);
+event_remove_timeout(struct event_timeout *ev) {
+    require_method(remove_timeout);
+    event_methods.remove_timeout(ev);
 }
 
 struct event_idle *
-event_add_idle(int priority, struct callback *cb)
-{
-	require_method2(add_idle, NULL);
-	return event_methods.add_idle(priority,cb);
+event_add_idle(int priority, struct callback *cb) {
+    require_method2(add_idle, NULL);
+    return event_methods.add_idle(priority,cb);
 }
 
 void
-event_remove_idle(struct event_idle *ev)
-{
-	require_method(remove_idle);
-	event_methods.remove_idle(ev);
+event_remove_idle(struct event_idle *ev) {
+    require_method(remove_idle);
+    event_methods.remove_idle(ev);
 }
 
 void
-event_call_callback(struct callback_list *cb)
-{
-	require_method(call_callback);
-	event_methods.call_callback(cb);
+event_call_callback(struct callback_list *cb) {
+    require_method(call_callback);
+    event_methods.call_callback(cb);
 }
 
 char const *
-event_system(void)
-{
-	return e_system;
+event_system(void) {
+    return e_system;
 }
 
 int
-event_request_system(const char *system, const char *requestor)
-{
-	void (*event_type_new)(struct event_methods *meth);
-	if (e_system) {
-		if (strcmp(e_system, system)) {
-			dbg(lvl_error,"system '%s' already requested by '%s', can't set to '%s' as requested from '%s'", e_system, e_requestor, system, requestor);
-			return 0;
-		}
-		return 1;
-	}
-	event_type_new=plugin_get_category_event(system);
-        if (! event_type_new) {
-		dbg(lvl_error,"unsupported event system '%s' requested from '%s'", system, requestor);
-                return 0;
-	}
-	event_type_new(&event_methods);
-	e_system=system;
-	e_requestor=requestor;
-	
-	return 1;
+event_request_system(const char *system, const char *requestor) {
+    void (*event_type_new)(struct event_methods *meth);
+    if (e_system) {
+        if (strcmp(e_system, system)) {
+            dbg(lvl_error,"system '%s' already requested by '%s', can't set to '%s' as requested from '%s'", e_system, e_requestor,
+                system, requestor);
+            return 0;
+        }
+        return 1;
+    }
+    event_type_new=plugin_get_category_event(system);
+    if (! event_type_new) {
+        dbg(lvl_error,"unsupported event system '%s' requested from '%s'", system, requestor);
+        return 0;
+    }
+    event_type_new(&event_methods);
+    e_system=system;
+    e_requestor=requestor;
+
+    return 1;
 }