Revert "Apply coding style"

This reverts commit 9b55f2dec0.

Sorting the includes creates some problems.

tests/unittests/test_cmd_connect.c

@@ -1,23 +1,22 @@
-#include <cmocka.h>
-#include <glib.h>
-#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 
 #include "xmpp/xmpp.h"
 
-#include "ui/stub_ui.h"
 #include "ui/ui.h"
+#include "ui/stub_ui.h"
 
 #include "command/cmd_funcs.h"
 #include "config/accounts.h"
 
 #define CMD_CONNECT "/connect"
 
-static void
-test_with_connection_status(jabber_conn_status_t status)
+static void test_with_connection_status(jabber_conn_status_t status)
 {
     will_return(connection_get_status, status);
 
@@ -27,28 +26,24 @@ test_with_connection_status(jabber_conn_status_t status)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_message_when_disconnecting(void** state)
+void cmd_connect_shows_message_when_disconnecting(void **state)
 {
     test_with_connection_status(JABBER_DISCONNECTING);
 }
 
-void
-cmd_connect_shows_message_when_connecting(void** state)
+void cmd_connect_shows_message_when_connecting(void **state)
 {
     test_with_connection_status(JABBER_CONNECTING);
 }
 
-void
-cmd_connect_shows_message_when_connected(void** state)
+void cmd_connect_shows_message_when_connected(void **state)
 {
     test_with_connection_status(JABBER_CONNECTED);
 }
 
-void
-cmd_connect_when_no_account(void** state)
+void cmd_connect_when_no_account(void **state)
 {
-    gchar* args[] = { "user@server.org", NULL };
+    gchar *args[] = { "user@server.org", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -69,10 +64,9 @@ cmd_connect_when_no_account(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_fail_message(void** state)
+void cmd_connect_fail_message(void **state)
 {
-    gchar* args[] = { "user@server.org", NULL };
+    gchar *args[] = { "user@server.org", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -95,10 +89,9 @@ cmd_connect_fail_message(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_lowercases_argument_with_no_account(void** state)
+void cmd_connect_lowercases_argument_with_no_account(void **state)
 {
-    gchar* args[] = { "USER@server.ORG", NULL };
+    gchar *args[] = { "USER@server.ORG", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -119,12 +112,11 @@ cmd_connect_lowercases_argument_with_no_account(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_lowercases_argument_with_account(void** state)
+void cmd_connect_lowercases_argument_with_account(void **state)
 {
-    gchar* args[] = { "Jabber_org", NULL };
-    ProfAccount* account = account_new("Jabber_org", "me@jabber.org", "password", NULL,
-                                       TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+gchar *args[] = { "Jabber_org", NULL };
+    ProfAccount *account = account_new("Jabber_org", "me@jabber.org", "password", NULL,
+        TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -140,12 +132,11 @@ cmd_connect_lowercases_argument_with_account(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_asks_password_when_not_in_account(void** state)
+void cmd_connect_asks_password_when_not_in_account(void **state)
 {
-    gchar* args[] = { "jabber_org", NULL };
-    ProfAccount* account = account_new("jabber_org", "me@jabber.org", NULL, NULL,
-                                       TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    gchar *args[] = { "jabber_org", NULL };
+    ProfAccount *account = account_new("jabber_org", "me@jabber.org", NULL, NULL,
+        TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -163,10 +154,9 @@ cmd_connect_asks_password_when_not_in_account(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_no_server_value(void** state)
+void cmd_connect_shows_usage_when_no_server_value(void **state)
 {
-    gchar* args[] = { "user@server.org", "server", NULL };
+    gchar *args[] = { "user@server.org", "server", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -177,10 +167,9 @@ cmd_connect_shows_usage_when_no_server_value(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_server_no_port_value(void** state)
+void cmd_connect_shows_usage_when_server_no_port_value(void **state)
 {
-    gchar* args[] = { "user@server.org", "server", "aserver", "port", NULL };
+    gchar *args[] = { "user@server.org", "server", "aserver", "port", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -191,10 +180,9 @@ cmd_connect_shows_usage_when_server_no_port_value(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_no_port_value(void** state)
+void cmd_connect_shows_usage_when_no_port_value(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", NULL };
+    gchar *args[] = { "user@server.org", "port", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -205,10 +193,9 @@ cmd_connect_shows_usage_when_no_port_value(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_port_no_server_value(void** state)
+void cmd_connect_shows_usage_when_port_no_server_value(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "5678", "server", NULL };
+    gchar *args[] = { "user@server.org", "port", "5678", "server", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -219,10 +206,9 @@ cmd_connect_shows_usage_when_port_no_server_value(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_message_when_port_0(void** state)
+void cmd_connect_shows_message_when_port_0(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "0", NULL };
+    gchar *args[] = { "user@server.org", "port", "0", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -233,10 +219,9 @@ cmd_connect_shows_message_when_port_0(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_message_when_port_minus1(void** state)
+void cmd_connect_shows_message_when_port_minus1(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "-1", NULL };
+    gchar *args[] = { "user@server.org", "port", "-1", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -247,10 +232,9 @@ cmd_connect_shows_message_when_port_minus1(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_message_when_port_65536(void** state)
+void cmd_connect_shows_message_when_port_65536(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "65536", NULL };
+    gchar *args[] = { "user@server.org", "port", "65536", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -261,10 +245,9 @@ cmd_connect_shows_message_when_port_65536(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_message_when_port_contains_chars(void** state)
+void cmd_connect_shows_message_when_port_contains_chars(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "52f66", NULL };
+    gchar *args[] = { "user@server.org", "port", "52f66", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -275,10 +258,9 @@ cmd_connect_shows_message_when_port_contains_chars(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_server_provided_twice(void** state)
+void cmd_connect_shows_usage_when_server_provided_twice(void **state)
 {
-    gchar* args[] = { "user@server.org", "server", "server1", "server", "server2", NULL };
+    gchar *args[] = { "user@server.org", "server", "server1", "server", "server2", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -289,10 +271,9 @@ cmd_connect_shows_usage_when_server_provided_twice(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_port_provided_twice(void** state)
+void cmd_connect_shows_usage_when_port_provided_twice(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "1111", "port", "1111", NULL };
+    gchar *args[] = { "user@server.org", "port", "1111", "port", "1111", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -303,10 +284,9 @@ cmd_connect_shows_usage_when_port_provided_twice(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_invalid_first_property(void** state)
+void cmd_connect_shows_usage_when_invalid_first_property(void **state)
 {
-    gchar* args[] = { "user@server.org", "wrong", "server", NULL };
+    gchar *args[] = { "user@server.org", "wrong", "server", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -317,10 +297,9 @@ cmd_connect_shows_usage_when_invalid_first_property(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_usage_when_invalid_second_property(void** state)
+void cmd_connect_shows_usage_when_invalid_second_property(void **state)
 {
-    gchar* args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL };
+    gchar *args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -331,10 +310,9 @@ cmd_connect_shows_usage_when_invalid_second_property(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_with_server_when_provided(void** state)
+void cmd_connect_with_server_when_provided(void **state)
 {
-    gchar* args[] = { "user@server.org", "server", "aserver", NULL };
+    gchar *args[] = { "user@server.org", "server", "aserver", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -355,10 +333,9 @@ cmd_connect_with_server_when_provided(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_with_port_when_provided(void** state)
+void cmd_connect_with_port_when_provided(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "5432", NULL };
+    gchar *args[] = { "user@server.org", "port", "5432", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -379,10 +356,9 @@ cmd_connect_with_port_when_provided(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_with_server_and_port_when_provided(void** state)
+void cmd_connect_with_server_and_port_when_provided(void **state)
 {
-    gchar* args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL };
+    gchar *args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL };
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -403,12 +379,11 @@ cmd_connect_with_server_and_port_when_provided(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_shows_message_when_connecting_with_account(void** state)
+void cmd_connect_shows_message_when_connecting_with_account(void **state)
 {
-    gchar* args[] = { "jabber_org", NULL };
-    ProfAccount* account = account_new("jabber_org", "user@jabber.org", "password", NULL,
-                                       TRUE, NULL, 0, "laptop", NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    gchar *args[] = { "jabber_org", NULL };
+    ProfAccount *account = account_new("jabber_org", "user@jabber.org", "password", NULL,
+        TRUE, NULL, 0, "laptop", NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
     will_return(connection_get_status, JABBER_DISCONNECTED);
 
@@ -424,12 +399,11 @@ cmd_connect_shows_message_when_connecting_with_account(void** state)
     assert_true(result);
 }
 
-void
-cmd_connect_connects_with_account(void** state)
+void cmd_connect_connects_with_account(void **state)
 {
-    gchar* args[] = { "jabber_org", NULL };
-    ProfAccount* account = account_new("jabber_org", "me@jabber.org", "password", NULL,
-                                       TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    gchar *args[] = { "jabber_org", NULL };
+    ProfAccount *account = account_new("jabber_org", "me@jabber.org", "password", NULL,
+        TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
     will_return(connection_get_status, JABBER_DISCONNECTED);