Revert "Apply coding style"

This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2.

Sorting the includes creates some problems.

1 files changed, 1176 insertions, 1130 deletions

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 1eb47f84..1020db96 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -38,50 +38,50 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <gio/gio.h>
+#include <assert.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <langinfo.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <gio/gio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <fcntl.h>
 #include <unistd.h>
+#include <langinfo.h>
+#include <ctype.h>
 
-#include "command/cmd_ac.h"
-#include "command/cmd_defs.h"
-#include "command/cmd_funcs.h"
+#include "profanity.h"
+#include "log.h"
 #include "common.h"
-#include "config/account.h"
+#include "command/cmd_funcs.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_ac.h"
 #include "config/accounts.h"
+#include "config/account.h"
 #include "config/preferences.h"
-#include "config/scripts.h"
 #include "config/theme.h"
 #include "config/tlscerts.h"
+#include "config/scripts.h"
 #include "event/client_events.h"
-#include "log.h"
-#include "plugins/plugins.h"
-#include "profanity.h"
-#include "tools/autocomplete.h"
-#include "tools/bookmark_ignore.h"
 #include "tools/http_upload.h"
+#include "tools/autocomplete.h"
 #include "tools/parser.h"
 #include "tools/tinyurl.h"
+#include "tools/bookmark_ignore.h"
+#include "plugins/plugins.h"
 #include "ui/ui.h"
 #include "ui/window_list.h"
-#include "xmpp/avatar.h"
-#include "xmpp/chat_session.h"
+#include "xmpp/xmpp.h"
 #include "xmpp/connection.h"
 #include "xmpp/contact.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "xmpp/muc.h"
-#include "xmpp/roster_list.h"
-#include "xmpp/xmpp.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/avatar.h"
 
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
@@ -98,8 +98,8 @@
 #endif
 
 #ifdef HAVE_GTK
-#include "tools/clipboard.h"
 #include "ui/tray.h"
+#include "tools/clipboard.h"
 #endif
 
 #ifdef HAVE_PYTHON
@@ -107,21 +107,21 @@
 #endif
 
 static void _update_presence(const resource_presence_t presence,
-                             const char* const show, gchar** args);
-static void _cmd_set_boolean_preference(gchar* arg, const char* const command,
-                                        const char* const display, preference_t pref);
-static void _who_room(ProfWin* window, const char* const command, gchar** args);
-static void _who_roster(ProfWin* window, const char* const command, gchar** args);
-static gboolean _cmd_execute(ProfWin* window, const char* const command, const char* const inp);
-static gboolean _cmd_execute_default(ProfWin* window, const char* inp);
-static gboolean _cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran);
+    const char *const show, gchar **args);
+static void _cmd_set_boolean_preference(gchar *arg, const char *const command,
+    const char *const display, preference_t pref);
+static void _who_room(ProfWin *window, const char *const command, gchar **args);
+static void _who_roster(ProfWin *window, const char *const command, gchar **args);
+static gboolean _cmd_execute(ProfWin *window, const char *const command, const char *const inp);
+static gboolean _cmd_execute_default(ProfWin *window, const char *inp);
+static gboolean _cmd_execute_alias(ProfWin *window, const char *const inp, gboolean *ran);
 
 /*
  * Take a line of input and process it, return TRUE if profanity is to
  * continue, FALSE otherwise
  */
 gboolean
-cmd_process_input(ProfWin* window, char* inp)
+cmd_process_input(ProfWin *window, char *inp)
 {
     log_debug("Input received: %s", inp);
     gboolean result = FALSE;
@@ -131,15 +131,15 @@ cmd_process_input(ProfWin* window, char* inp)
     if (strlen(inp) == 0) {
         result = TRUE;
 
-        // handle command if input starts with a '/'
+    // handle command if input starts with a '/'
     } else if (inp[0] == '/') {
-        char* inp_cpy = strdup(inp);
-        char* command = strtok(inp_cpy, " ");
-        char* question_mark = strchr(command, '?');
+        char *inp_cpy = strdup(inp);
+        char *command = strtok(inp_cpy, " ");
+        char *question_mark = strchr(command, '?');
         if (question_mark) {
             *question_mark = '\0';
-            char* fakeinp;
-            if (asprintf(&fakeinp, "/help %s", command + 1)) {
+            char *fakeinp;
+            if (asprintf(&fakeinp, "/help %s", command+1)) {
                 result = _cmd_execute(window, "/help", fakeinp);
                 free(fakeinp);
             }
@@ -148,7 +148,7 @@ cmd_process_input(ProfWin* window, char* inp)
         }
         free(inp_cpy);
 
-        // call a default handler if input didn't start with '/'
+    // call a default handler if input didn't start with '/'
     } else {
         result = _cmd_execute_default(window, inp);
     }
@@ -159,16 +159,16 @@ cmd_process_input(ProfWin* window, char* inp)
 // Command execution
 
 void
-cmd_execute_connect(ProfWin* window, const char* const account)
+cmd_execute_connect(ProfWin *window, const char *const account)
 {
-    GString* command = g_string_new("/connect ");
+    GString *command = g_string_new("/connect ");
     g_string_append(command, account);
     cmd_process_input(window, command->str);
     g_string_free(command, TRUE);
 }
 
 gboolean
-cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args)
+cmd_tls_certpath(ProfWin *window, const char *const command, gchar **args)
 {
 #ifdef HAVE_LIBMESODE
     if (g_strcmp0(args[1], "set") == 0) {
@@ -193,7 +193,7 @@ cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args)
         cons_show("Certificate path defaulted to finding system certpath.");
         return TRUE;
     } else if (args[1] == NULL) {
-        char* path = prefs_get_tls_certpath();
+        char *path = prefs_get_tls_certpath();
         if (path) {
             cons_show("Trusted certificate path: %s", path);
             free(path);
@@ -209,10 +209,11 @@ cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args)
     cons_show("Certificate path setting only supported when built with libmesode.");
     return TRUE;
 #endif
+
 }
 
 gboolean
-cmd_tls_trust(ProfWin* window, const char* const command, gchar** args)
+cmd_tls_trust(ProfWin *window, const char *const command, gchar **args)
 {
 #ifdef HAVE_LIBMESODE
     jabber_conn_status_t conn_status = connection_get_status();
@@ -224,7 +225,7 @@ cmd_tls_trust(ProfWin* window, const char* const command, gchar** args)
         cons_show("No TLS connection established");
         return TRUE;
     }
-    TLSCertificate* cert = connection_get_tls_peer_cert();
+    TLSCertificate *cert = connection_get_tls_peer_cert();
     if (!cert) {
         cons_show("Error getting TLS certificate.");
         return TRUE;
@@ -245,11 +246,11 @@ cmd_tls_trust(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_tls_trusted(ProfWin* window, const char* const command, gchar** args)
+cmd_tls_trusted(ProfWin *window, const char *const command, gchar **args)
 {
 #ifdef HAVE_LIBMESODE
-    GList* certs = tlscerts_list();
-    GList* curr = certs;
+    GList *certs = tlscerts_list();
+    GList *curr = certs;
 
     if (curr) {
         cons_show("Trusted certificates:");
@@ -258,7 +259,7 @@ cmd_tls_trusted(ProfWin* window, const char* const command, gchar** args)
         cons_show("No trusted certificates found.");
     }
     while (curr) {
-        TLSCertificate* cert = curr->data;
+        TLSCertificate *cert = curr->data;
         cons_show_tlscert_summary(cert);
         cons_show("");
         curr = g_list_next(curr);
@@ -272,7 +273,7 @@ cmd_tls_trusted(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_tls_revoke(ProfWin* window, const char* const command, gchar** args)
+cmd_tls_revoke(ProfWin *window, const char *const command, gchar **args)
 {
 #ifdef HAVE_LIBMESODE
     if (args[1] == NULL) {
@@ -293,11 +294,11 @@ cmd_tls_revoke(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_tls_cert(ProfWin* window, const char* const command, gchar** args)
+cmd_tls_cert(ProfWin *window, const char *const command, gchar **args)
 {
 #ifdef HAVE_LIBMESODE
     if (args[1]) {
-        TLSCertificate* cert = tlscerts_get_trusted(args[1]);
+        TLSCertificate *cert = tlscerts_get_trusted(args[1]);
         if (!cert) {
             cons_show("No such certificate.");
         } else {
@@ -315,7 +316,7 @@ cmd_tls_cert(ProfWin* window, const char* const command, gchar** args)
             cons_show("No TLS connection established");
             return TRUE;
         }
-        TLSCertificate* cert = connection_get_tls_peer_cert();
+        TLSCertificate *cert = connection_get_tls_peer_cert();
         if (!cert) {
             cons_show("Error getting TLS certificate.");
             return TRUE;
@@ -332,7 +333,7 @@ cmd_tls_cert(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_connect(ProfWin* window, const char* const command, gchar** args)
+cmd_connect(ProfWin *window, const char *const command, gchar **args)
 {
     jabber_conn_status_t conn_status = connection_get_status();
     if (conn_status != JABBER_DISCONNECTED) {
@@ -340,10 +341,10 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         return TRUE;
     }
 
-    gchar* opt_keys[] = { "server", "port", "tls", "auth", NULL };
+    gchar *opt_keys[] = { "server", "port", "tls", "auth", NULL };
     gboolean parsed;
 
-    GHashTable* options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed);
+    GHashTable *options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed);
     if (!parsed) {
         cons_bad_cmd_usage(command);
         cons_show("");
@@ -351,18 +352,25 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         return TRUE;
     }
 
-    char* altdomain = g_hash_table_lookup(options, "server");
+    char *altdomain = g_hash_table_lookup(options, "server");
 
-    char* tls_policy = g_hash_table_lookup(options, "tls");
-    if (tls_policy && (g_strcmp0(tls_policy, "force") != 0) && (g_strcmp0(tls_policy, "allow") != 0) && (g_strcmp0(tls_policy, "trust") != 0) && (g_strcmp0(tls_policy, "disable") != 0) && (g_strcmp0(tls_policy, "legacy") != 0)) {
+    char *tls_policy = g_hash_table_lookup(options, "tls");
+    if (tls_policy &&
+            (g_strcmp0(tls_policy, "force") != 0) &&
+            (g_strcmp0(tls_policy, "allow") != 0) &&
+            (g_strcmp0(tls_policy, "trust") != 0) &&
+            (g_strcmp0(tls_policy, "disable") != 0) &&
+            (g_strcmp0(tls_policy, "legacy") != 0)) {
         cons_bad_cmd_usage(command);
         cons_show("");
         options_destroy(options);
         return TRUE;
     }
 
-    char* auth_policy = g_hash_table_lookup(options, "auth");
-    if (auth_policy && (g_strcmp0(auth_policy, "default") != 0) && (g_strcmp0(auth_policy, "legacy") != 0)) {
+    char *auth_policy = g_hash_table_lookup(options, "auth");
+    if (auth_policy &&
+            (g_strcmp0(auth_policy, "default") != 0) &&
+            (g_strcmp0(auth_policy, "legacy") != 0)) {
         cons_bad_cmd_usage(command);
         cons_show("");
         options_destroy(options);
@@ -371,8 +379,8 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
 
     int port = 0;
     if (g_hash_table_contains(options, "port")) {
-        char* port_str = g_hash_table_lookup(options, "port");
-        char* err_msg = NULL;
+        char *port_str = g_hash_table_lookup(options, "port");
+        char *err_msg = NULL;
         gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg);
         if (!res) {
             cons_show(err_msg);
@@ -384,8 +392,8 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         }
     }
 
-    char* user = args[0];
-    char* def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
+    char *user = args[0];
+    char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
     if (!user) {
         if (def) {
             user = def;
@@ -397,12 +405,12 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         }
     }
 
-    char* jid;
+    char *jid;
     user = strdup(user);
     g_free(def);
 
     // connect with account
-    ProfAccount* account = accounts_get_account(user);
+    ProfAccount *account = accounts_get_account(user);
     if (account) {
         // override account options with connect options
         if (altdomain != NULL)
@@ -418,7 +426,7 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         if (account->password) {
             conn_status = cl_ev_connect_account(account);
 
-            // use eval_password if set
+        // use eval_password if set
         } else if (account->eval_password) {
             gboolean res = account_eval_password(account);
             if (res) {
@@ -433,7 +441,7 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
                 return TRUE;
             }
 
-            // no account password setting, prompt
+        // no account password setting, prompt
         } else {
             account->password = ui_ask_password();
             conn_status = cl_ev_connect_account(account);
@@ -444,10 +452,10 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         jid = account_create_connect_jid(account);
         account_free(account);
 
-        // connect with JID
+    // connect with JID
     } else {
         jid = g_utf8_strdown(user, -1);
-        char* passwd = ui_ask_password();
+        char *passwd = ui_ask_password();
         conn_status = cl_ev_connect_jid(jid, passwd, altdomain, port, tls_policy, auth_policy);
         free(passwd);
     }
@@ -465,9 +473,9 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_list(ProfWin* window, const char* const command, gchar** args)
+cmd_account_list(ProfWin *window, const char *const command, gchar **args)
 {
-    gchar** accounts = accounts_get_list();
+    gchar **accounts = accounts_get_list();
     cons_show_account_list(accounts);
     g_strfreev(accounts);
 
@@ -475,15 +483,15 @@ cmd_account_list(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_show(ProfWin* window, const char* const command, gchar** args)
+cmd_account_show(ProfWin *window, const char *const command, gchar **args)
 {
-    char* account_name = args[1];
+    char *account_name = args[1];
     if (account_name == NULL) {
         cons_bad_cmd_usage(command);
         return TRUE;
     }
 
-    ProfAccount* account = accounts_get_account(account_name);
+    ProfAccount *account = accounts_get_account(account_name);
     if (account == NULL) {
         cons_show("No such account.");
         cons_show("");
@@ -496,9 +504,9 @@ cmd_account_show(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_add(ProfWin* window, const char* const command, gchar** args)
+cmd_account_add(ProfWin *window, const char *const command, gchar **args)
 {
-    char* account_name = args[1];
+    char *account_name = args[1];
     if (account_name == NULL) {
         cons_bad_cmd_usage(command);
         return TRUE;
@@ -512,18 +520,18 @@ cmd_account_add(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_remove(ProfWin* window, const char* const command, gchar** args)
+cmd_account_remove(ProfWin *window, const char *const command, gchar **args)
 {
-    char* account_name = args[1];
-    if (!account_name) {
+    char *account_name = args[1];
+    if(!account_name) {
         cons_bad_cmd_usage(command);
         return TRUE;
     }
 
-    char* def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
-    if (accounts_remove(account_name)) {
+    char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
+    if(accounts_remove(account_name)){
         cons_show("Account %s removed.", account_name);
-        if (def && strcmp(def, account_name) == 0) {
+        if(def && strcmp(def, account_name) == 0){
             prefs_set_string(PREF_DEFAULT_ACCOUNT, NULL);
             cons_show("Default account removed because the corresponding account was removed.");
         }
@@ -538,9 +546,9 @@ cmd_account_remove(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_enable(ProfWin* window, const char* const command, gchar** args)
+cmd_account_enable(ProfWin *window, const char *const command, gchar **args)
 {
-    char* account_name = args[1];
+    char *account_name = args[1];
     if (account_name == NULL) {
         cons_bad_cmd_usage(command);
         return TRUE;
@@ -557,9 +565,9 @@ cmd_account_enable(ProfWin* window, const char* const command, gchar** args)
     return TRUE;
 }
 gboolean
-cmd_account_disable(ProfWin* window, const char* const command, gchar** args)
+cmd_account_disable(ProfWin *window, const char *const command, gchar **args)
 {
-    char* account_name = args[1];
+    char *account_name = args[1];
     if (account_name == NULL) {
         cons_bad_cmd_usage(command);
         return TRUE;
@@ -577,15 +585,15 @@ cmd_account_disable(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_rename(ProfWin* window, const char* const command, gchar** args)
+cmd_account_rename(ProfWin *window, const char *const command, gchar **args)
 {
     if (g_strv_length(args) != 3) {
         cons_bad_cmd_usage(command);
         return TRUE;
     }
 
-    char* account_name = args[1];
-    char* new_name = args[2];
+    char *account_name = args[1];
+    char *new_name = args[2];
 
     if (accounts_rename(account_name, new_name)) {
         cons_show("Account renamed.");
@@ -599,10 +607,10 @@ cmd_account_rename(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_default(ProfWin* window, const char* const command, gchar** args)
+cmd_account_default(ProfWin *window, const char *const command, gchar **args)
 {
     if (g_strv_length(args) == 1) {
-        char* def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
+        char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
         if (def) {
             cons_show("The default account is %s.", def);
             free(def);
@@ -618,7 +626,7 @@ cmd_account_default(ProfWin* window, const char* const command, gchar** args)
         }
     } else if (g_strv_length(args) == 3) {
         if (strcmp(args[1], "set") == 0) {
-            ProfAccount* account_p = accounts_get_account(args[2]);
+            ProfAccount *account_p = accounts_get_account(args[2]);
             if (account_p) {
                 prefs_set_string(PREF_DEFAULT_ACCOUNT, args[2]);
                 cons_show("Default account set to %s.", args[2]);
@@ -637,9 +645,9 @@ cmd_account_default(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-_account_set_jid(char* account_name, char* jid)
+_account_set_jid(char *account_name, char *jid)
 {
-    Jid* jidp = jid_create(jid);
+    Jid *jidp = jid_create(jid);
     if (jidp == NULL) {
         cons_show("Malformed jid: %s", jid);
     } else {
@@ -657,7 +665,7 @@ _account_set_jid(char* account_name, char* jid)
 }
 
 gboolean
-_account_set_server(char* account_name, char* server)
+_account_set_server(char *account_name, char *server)
 {
     accounts_set_server(account_name, server);
     cons_show("Updated server for account %s: %s", account_name, server);
@@ -666,10 +674,10 @@ _account_set_server(char* account_name, char* server)
 }
 
 gboolean
-_account_set_port(char* account_name, char* port)
+_account_set_port(char *account_name, char *port)
 {
     int porti;
-    char* err_msg = NULL;
+    char *err_msg = NULL;
     gboolean res = strtoi_range(port, &porti, 1, 65535, &err_msg);
     if (!res) {
         cons_show(err_msg);
@@ -684,7 +692,7 @@ _account_set_port(char* account_name, char* port)
 }
 
 gboolean
-_account_set_resource(char* account_name, char* resource)
+_account_set_resource(char *account_name, char *resource)
 {
     accounts_set_resource(account_name, resource);
     if (connection_get_status() == JABBER_CONNECTED) {
@@ -697,9 +705,9 @@ _account_set_resource(char* account_name, char* resource)
 }
 
 gboolean
-_account_set_password(char* account_name, char* password)
+_account_set_password(char *account_name, char *password)
 {
-    ProfAccount* account = accounts_get_account(account_name);
+    ProfAccount *account = accounts_get_account(account_name);
     if (account->eval_password) {
         cons_show("Cannot set password when eval_password is set.");
     } else {
@@ -712,10 +720,10 @@ _account_set_password(char* account_name, char* password)
 }
 
 gboolean
-_account_set_eval_password(char* account_name, char* eval_password)
+_account_set_eval_password(char *account_name, char *eval_password)
 {
-    ProfAccount* account = accounts_get_account(account_name);
-    if (account->password) {
+    ProfAccount *account = accounts_get_account(account_name);
+    if(account->password) {
         cons_show("Cannot set eval_password when password is set.");
     } else {
         accounts_set_eval_password(account_name, eval_password);
@@ -727,7 +735,7 @@ _account_set_eval_password(char* account_name, char* eval_password)
 }
 
 gboolean
-_account_set_muc(char* account_name, char* muc)
+_account_set_muc(char *account_name, char *muc)
 {
     accounts_set_muc_service(account_name, muc);
     cons_show("Updated muc service for account %s: %s", account_name, muc);
@@ -736,7 +744,7 @@ _account_set_muc(char* account_name, char* muc)
 }
 
 gboolean
-_account_set_nick(char* account_name, char* nick)
+_account_set_nick(char *account_name, char *nick)
 {
     accounts_set_muc_nick(account_name, nick);
     cons_show("Updated muc nick for account %s: %s", account_name, nick);
@@ -745,11 +753,11 @@ _account_set_nick(char* account_name, char* nick)
 }
 
 gboolean
-_account_set_otr(char* account_name, char* policy)
+_account_set_otr(char *account_name, char *policy)
 {
     if ((g_strcmp0(policy, "manual") != 0)
-        && (g_strcmp0(policy, "opportunistic") != 0)
-        && (g_strcmp0(policy, "always") != 0)) {
+            && (g_strcmp0(policy, "opportunistic") != 0)
+            && (g_strcmp0(policy, "always") != 0)) {
         cons_show("OTR policy must be one of: manual, opportunistic or always.");
     } else {
         accounts_set_otr_policy(account_name, policy);
@@ -760,7 +768,7 @@ _account_set_otr(char* account_name, char* policy)
 }
 
 gboolean
-_account_set_status(char* account_name, char* status)
+_account_set_status(char *account_name, char *status)
 {
     if (!valid_resource_presence_string(status) && (strcmp(status, "last") != 0)) {
         cons_show("Invalid status: %s", status);
@@ -773,10 +781,10 @@ _account_set_status(char* account_name, char* status)
 }
 
 gboolean
-_account_set_pgpkeyid(char* account_name, char* pgpkeyid)
+_account_set_pgpkeyid(char *account_name, char *pgpkeyid)
 {
 #ifdef HAVE_LIBGPGME
-    char* err_str = NULL;
+    char *err_str = NULL;
     if (!p_gpg_valid_key(pgpkeyid, &err_str)) {
         cons_show("Invalid PGP key ID specified: %s, see /pgp keys", err_str);
     } else {
@@ -792,7 +800,7 @@ _account_set_pgpkeyid(char* account_name, char* pgpkeyid)
 }
 
 gboolean
-_account_set_startscript(char* account_name, char* script)
+_account_set_startscript(char *account_name, char *script)
 {
     accounts_set_script_start(account_name, script);
     cons_show("Updated start script for account %s: %s", account_name, script);
@@ -800,7 +808,7 @@ _account_set_startscript(char* account_name, char* script)
 }
 
 gboolean
-_account_set_theme(char* account_name, char* theme)
+_account_set_theme(char *account_name, char *theme)
 {
     if (!theme_exists(theme)) {
         cons_show("Theme does not exist: %s", theme);
@@ -809,7 +817,7 @@ _account_set_theme(char* account_name, char* theme)
 
     accounts_set_theme(account_name, theme);
     if (connection_get_status() == JABBER_CONNECTED) {
-        ProfAccount* account = accounts_get_account(session_get_account_name());
+        ProfAccount *account = accounts_get_account(session_get_account_name());
         if (account) {
             if (g_strcmp0(account->name, account_name) == 0) {
                 theme_load(theme, false);
@@ -834,13 +842,13 @@ _account_set_theme(char* account_name, char* theme)
 }
 
 gboolean
-_account_set_tls(char* account_name, char* policy)
+_account_set_tls(char *account_name, char *policy)
 {
     if ((g_strcmp0(policy, "force") != 0)
-        && (g_strcmp0(policy, "allow") != 0)
-        && (g_strcmp0(policy, "trust") != 0)
-        && (g_strcmp0(policy, "disable") != 0)
-        && (g_strcmp0(policy, "legacy") != 0)) {
+            && (g_strcmp0(policy, "allow") != 0)
+            && (g_strcmp0(policy, "trust") != 0)
+            && (g_strcmp0(policy, "disable") != 0)
+            && (g_strcmp0(policy, "legacy") != 0)) {
         cons_show("TLS policy must be one of: force, allow, legacy or disable.");
     } else {
         accounts_set_tls_policy(account_name, policy);
@@ -851,10 +859,10 @@ _account_set_tls(char* account_name, char* policy)
 }
 
 gboolean
-_account_set_auth(char* account_name, char* policy)
+_account_set_auth(char *account_name, char *policy)
 {
     if ((g_strcmp0(policy, "default") != 0)
-        && (g_strcmp0(policy, "legacy") != 0)) {
+            && (g_strcmp0(policy, "legacy") != 0)) {
         cons_show("Auth policy must be either default or legacy.");
     } else {
         accounts_set_auth_policy(account_name, policy);
@@ -865,10 +873,10 @@ _account_set_auth(char* account_name, char* policy)
 }
 
 gboolean
-_account_set_presence_priority(char* account_name, char* presence, char* priority)
+_account_set_presence_priority(char *account_name, char *presence, char *priority)
 {
     int intval;
-    char* err_msg = NULL;
+    char *err_msg = NULL;
     gboolean res = strtoi_range(priority, &intval, -128, 127, &err_msg);
     if (!res) {
         cons_show(err_msg);
@@ -877,7 +885,8 @@ _account_set_presence_priority(char* account_name, char* presence, char* priorit
     }
 
     resource_presence_t presence_type = resource_presence_from_string(presence);
-    switch (presence_type) {
+    switch (presence_type)
+    {
     case (RESOURCE_ONLINE):
         accounts_set_priority_online(account_name, intval);
         break;
@@ -897,7 +906,7 @@ _account_set_presence_priority(char* account_name, char* presence, char* priorit
 
     jabber_conn_status_t conn_status = connection_get_status();
     if (conn_status == JABBER_CONNECTED) {
-        char* connected_account = session_get_account_name();
+        char *connected_account = session_get_account_name();
         resource_presence_t last_presence = accounts_get_last_presence(connected_account);
         if (presence_type == last_presence) {
             cl_ev_presence_send(last_presence, 0);
@@ -909,52 +918,37 @@ _account_set_presence_priority(char* account_name, char* presence, char* priorit
 }
 
 gboolean
-cmd_account_set(ProfWin* window, const char* const command, gchar** args)
+cmd_account_set(ProfWin *window, const char *const command, gchar **args)
 {
     if (g_strv_length(args) != 4) {
         cons_bad_cmd_usage(command);
         return TRUE;
     }
 
-    char* account_name = args[1];
+    char *account_name = args[1];
     if (!accounts_account_exists(account_name)) {
         cons_show("Account %s doesn't exist", account_name);
         cons_show("");
         return TRUE;
     }
 
-    char* property = args[2];
-    char* value = args[3];
-    if (strcmp(property, "jid") == 0)
-        return _account_set_jid(account_name, value);
-    if (strcmp(property, "server") == 0)
-        return _account_set_server(account_name, value);
-    if (strcmp(property, "port") == 0)
-        return _account_set_port(account_name, value);
-    if (strcmp(property, "resource") == 0)
-        return _account_set_resource(account_name, value);
-    if (strcmp(property, "password") == 0)
-        return _account_set_password(account_name, value);
-    if (strcmp(property, "eval_password") == 0)
-        return _account_set_eval_password(account_name, value);
-    if (strcmp(property, "muc") == 0)
-        return _account_set_muc(account_name, value);
-    if (strcmp(property, "nick") == 0)
-        return _account_set_nick(account_name, value);
-    if (strcmp(property, "otr") == 0)
-        return _account_set_otr(account_name, value);
-    if (strcmp(property, "status") == 0)
-        return _account_set_status(account_name, value);
-    if (strcmp(property, "pgpkeyid") == 0)
-        return _account_set_pgpkeyid(account_name, value);
-    if (strcmp(property, "startscript") == 0)
-        return _account_set_startscript(account_name, value);
-    if (strcmp(property, "theme") == 0)
-        return _account_set_theme(account_name, value);
-    if (strcmp(property, "tls") == 0)
-        return _account_set_tls(account_name, value);
-    if (strcmp(property, "auth") == 0)
-        return _account_set_auth(account_name, value);
+    char *property = args[2];
+    char *value = args[3];
+    if (strcmp(property, "jid") == 0)           return _account_set_jid(account_name, value);
+    if (strcmp(property, "server") == 0)        return _account_set_server(account_name, value);
+    if (strcmp(property, "port") == 0)          return _account_set_port(account_name, value);
+    if (strcmp(property, "resource") == 0)      return _account_set_resource(account_name, value);
+    if (strcmp(property, "password") == 0)      return _account_set_password(account_name, value);
+    if (strcmp(property, "eval_password") == 0) return _account_set_eval_password(account_name, value);
+    if (strcmp(property, "muc") == 0)           return _account_set_muc(account_name, value);
+    if (strcmp(property, "nick") == 0)          return _account_set_nick(account_name, value);
+    if (strcmp(property, "otr") == 0)           return _account_set_otr(account_name, value);
+    if (strcmp(property, "status") == 0)        return _account_set_status(account_name, value);
+    if (strcmp(property, "pgpkeyid") == 0)      return _account_set_pgpkeyid(account_name, value);
+    if (strcmp(property, "startscript") == 0)   return _account_set_startscript(account_name, value);
+    if (strcmp(property, "theme") == 0)         return _account_set_theme(account_name, value);
+    if (strcmp(property, "tls") == 0)           return _account_set_tls(account_name, value);
+    if (strcmp(property, "auth") == 0)          return _account_set_auth(account_name, value);
 
     if (valid_resource_presence_string(property)) {
         return _account_set_presence_priority(account_name, property, value);
@@ -967,21 +961,21 @@ cmd_account_set(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account_clear(ProfWin* window, const char* const command, gchar** args)
+cmd_account_clear(ProfWin *window, const char *const command, gchar **args)
 {
     if (g_strv_length(args) != 3) {
         cons_bad_cmd_usage(command);
         return TRUE;
     }
 
-    char* account_name = args[1];
+    char *account_name = args[1];
     if (!accounts_account_exists(account_name)) {
         cons_show("Account %s doesn't exist", account_name);
         cons_show("");
         return TRUE;
     }
 
-    char* property = args[2];
+    char *property = args[2];
     if (strcmp(property, "password") == 0) {
         accounts_clear_password(account_name);
         cons_show("Removed password for account %s", account_name);
@@ -1031,7 +1025,7 @@ cmd_account_clear(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_account(ProfWin* window, const char* const command, gchar** args)
+cmd_account(ProfWin *window, const char *const command, gchar **args)
 {
     if (args[0] != NULL) {
         cons_bad_cmd_usage(command);
@@ -1044,7 +1038,7 @@ cmd_account(ProfWin* window, const char* const command, gchar** args)
         return TRUE;
     }
 
-    ProfAccount* account = accounts_get_account(session_get_account_name());
+    ProfAccount *account = accounts_get_account(session_get_account_name());
     if (account) {
         cons_show_account(account);
         account_free(account);
@@ -1056,7 +1050,7 @@ cmd_account(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_script(ProfWin* window, const char* const command, gchar** args)
+cmd_script(ProfWin *window, const char *const command, gchar **args)
 {
     if ((g_strcmp0(args[0], "run") == 0) && args[1]) {
         gboolean res = scripts_exec(args[1]);
@@ -1064,11 +1058,11 @@ cmd_script(ProfWin* window, const char* const command, gchar** args)
             cons_show("Could not find script %s", args[1]);
         }
     } else if (g_strcmp0(args[0], "list") == 0) {
-        GSList* scripts = scripts_list();
+        GSList *scripts = scripts_list();
         cons_show_scripts(scripts);
         g_slist_free_full(scripts, g_free);
     } else if ((g_strcmp0(args[0], "show") == 0) && args[1]) {
-        GSList* commands = scripts_read(args[1]);
+        GSList *commands = scripts_read(args[1]);
         cons_show_script(args[1], commands);
         g_slist_free_full(commands, g_free);
     } else {
@@ -1080,22 +1074,16 @@ cmd_script(ProfWin* window, const char* const command, gchar** args)
 
 /* escape a string into csv and write it to the file descriptor */
 static int
-_writecsv(int fd, const char* const str)
+_writecsv(int fd, const char *const str)
 {
-    if (!str)
-        return 0;
+    if (!str) return 0;
     size_t len = strlen(str);
-    char* s = malloc(2 * len * sizeof(char));
-    char* c = s;
+    char *s = malloc(2 * len * sizeof(char));
+    char *c = s;
     int i = 0;
     for (; i < strlen(str); i++) {
-        if (str[i] != '"')
-            *c++ = str[i];
-        else {
-            *c++ = '"';
-            *c++ = '"';
-            len++;
-        }
+        if (str[i] != '"') *c++ = str[i];
+        else { *c++ = '"'; *c++ = '"'; len++; }
     }
     if (-1 == write(fd, s, len)) {
         cons_show("error: failed to write '%s' to the requested file: %s", s, strerror(errno));
@@ -1106,7 +1094,7 @@ _writecsv(int fd, const char* const str)
 }
 
 gboolean
-cmd_export(ProfWin* window, const char* const command, gchar** args)
+cmd_export(ProfWin *window, const char *const command, gchar **args)
 {
     jabber_conn_status_t conn_status = connection_get_status();
 
@@ -1115,8 +1103,8 @@ cmd_export(ProfWin* window, const char* const command, gchar** args)
         cons_show("");
         return TRUE;
     } else {
-        GString* fname = g_string_new("");
-        GSList* list = NULL;
+        GString *fname = g_string_new("");
+        GSList *list = NULL;
         int fd;
 
         /* deal with the ~ convention for $HOME */
@@ -1136,28 +1124,22 @@ cmd_export(ProfWin* window, const char* const command, gchar** args)
             return TRUE;
         }
 
-        if (-1 == write(fd, "jid,name\n", strlen("jid,name\n")))
-            goto write_error;
+        if (-1 == write(fd, "jid,name\n", strlen("jid,name\n"))) goto write_error;
 
         list = roster_get_contacts(ROSTER_ORD_NAME);
         if (list) {
-            GSList* curr = list;
-            while (curr) {
+            GSList *curr = list;
+            while (curr){
                 PContact contact = curr->data;
-                const char* jid = p_contact_barejid(contact);
-                const char* name = p_contact_name(contact);
+                const char *jid = p_contact_barejid(contact);
+                const char  *name = p_contact_name(contact);
 
                 /* write the data to the file */
-                if (-1 == write(fd, "\"", 1))
-                    goto write_error;
-                if (-1 == _writecsv(fd, jid))
-                    goto write_error;
-                if (-1 == write(fd, "\",\"", 3))
-                    goto write_error;
-                if (-1 == _writecsv(fd, name))
-                    goto write_error;
-                if (-1 == write(fd, "\"\n", 2))
-                    goto write_error;
+                if (-1 == write(fd, "\"", 1)) goto write_error;
+                if (-1 == _writecsv(fd, jid)) goto write_error;
+                if (-1 == write(fd, "\",\"", 3)) goto write_error;
+                if (-1 == _writecsv(fd, name)) goto write_error;
+                if (-1 == write(fd, "\"\n", 2)) goto write_error;
 
                 /* loop */
                 curr = g_slist_next(curr);
@@ -1172,7 +1154,7 @@ cmd_export(ProfWin* window, const char* const command, gchar** args)
         g_slist_free(list);
         close(fd);
         return TRUE;
-    write_error:
+write_error:
         cons_show("error: write failed: %s", strerror(errno));
         cons_show("");
         g_slist_free(list);
@@ -1182,7 +1164,7 @@ cmd_export(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_sub(ProfWin* window, const char* const command, gchar** args)
+cmd_sub(ProfWin *window, const char *const command, gchar **args)
 {
     jabber_conn_status_t conn_status = connection_get_status();
 
@@ -1216,12 +1198,12 @@ cmd_sub(ProfWin* window, const char* const command, gchar** args)
     }
 
     if (jid == NULL) {
-        ProfChatWin* chatwin = (ProfChatWin*)window;
+        ProfChatWin *chatwin = (ProfChatWin*)window;
         assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
         jid = chatwin->barejid;
     }
 
-    Jid* jidp = jid_create(jid);
+    Jid *jidp = jid_create(jid);
 
     if (strcmp(subcmd, "allow") == 0) {
         presence_subscription(jidp->barejid, PRESENCE_SUBSCRIBED);
@@ -1247,18 +1229,18 @@ cmd_sub(ProfWin* window, const char* const command, gchar** args)
             if (window->type == WIN_CHAT) {
                 if (p_contact_pending_out(contact)) {
                     win_println(window, THEME_DEFAULT, "-", "%s subscription status: %s, request pending.",
-                                jidp->barejid, p_contact_subscription(contact));
+                        jidp->barejid, p_contact_subscription(contact));
                 } else {
                     win_println(window, THEME_DEFAULT, "-", "%s subscription status: %s.", jidp->barejid,
-                                p_contact_subscription(contact));
+                        p_contact_subscription(contact));
                 }
             } else {
                 if (p_contact_pending_out(contact)) {
                     cons_show("%s subscription status: %s, request pending.",
-                              jidp->barejid, p_contact_subscription(contact));
+                        jidp->barejid, p_contact_subscription(contact));
                 } else {
                     cons_show("%s subscription status: %s.", jidp->barejid,
-                              p_contact_subscription(contact));
+                        p_contact_subscription(contact));
                 }
             }
         }
@@ -1272,7 +1254,7 @@ cmd_sub(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_disconnect(ProfWin* window, const char* const command, gchar** args)
+cmd_disconnect(ProfWin *window, const char *const command, gchar **args)
 {
     if (connection_get_status() != JABBER_CONNECTED) {
         cons_show("You are not currently connected.");
@@ -1281,7 +1263,7 @@ cmd_disconnect(ProfWin* window, const char* const command, gchar** args)
 
     cl_ev_disconnect();
 
-    char* theme = prefs_get_string(PREF_THEME);
+    char *theme = prefs_get_string(PREF_THEME);
     if (theme) {
         gboolean res = theme_load(theme, false);
         g_free(theme);
@@ -1308,7 +1290,7 @@ cmd_disconnect(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_quit(ProfWin* window, const char* const command, gchar** args)
+cmd_quit(ProfWin *window, const char *const command, gchar **args)
 {
     log_info("Profanity is shutting down...");
     exit(0);
@@ -1316,21 +1298,21 @@ cmd_quit(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_wins_unread(ProfWin* window, const char* const command, gchar** args)
+cmd_wins_unread(ProfWin *window, const char *const command, gchar **args)
 {
     cons_show_wins(TRUE);
     return TRUE;
 }
 
 gboolean
-cmd_wins_prune(ProfWin* window, const char* const command, gchar** args)
+cmd_wins_prune(ProfWin *window, const char *const command, gchar **args)
 {
     ui_prune_wins();
     return TRUE;
 }
 
 gboolean
-cmd_wins_swap(ProfWin* window, const char* const command, gchar** args)
+cmd_wins_swap(ProfWin *window, const char *const command, gchar **args)
 {
     if ((args[1] == NULL) || (args[2] == NULL)) {
         cons_bad_cmd_usage(command);
@@ -1371,7 +1353,7 @@ cmd_wins_swap(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_wins(ProfWin* window, const char* const command, gchar** args)
+cmd_wins(ProfWin *window, const char *const command, gchar **args)
 {
     if (args[0] != NULL) {
         cons_bad_cmd_usage(command);
@@ -1383,7 +1365,7 @@ cmd_wins(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_close(ProfWin* window, const char* const command, gchar** args)
+cmd_close(ProfWin *window, const char *const command, gchar **args)
 {
     jabber_conn_status_t conn_status = connection_get_status();
 
@@ -1442,7 +1424,7 @@ cmd_close(ProfWin* window, const char* const command, gchar** args)
             return TRUE;
         }
 
-        ProfWin* toclose = wins_get_by_num(index);
+        ProfWin *toclose = wins_get_by_num(index);
         if (!toclose) {
             cons_show("Window is not open.");
             return TRUE;
@@ -1472,7 +1454,7 @@ cmd_close(ProfWin* window, const char* const command, gchar** args)
             return TRUE;
         }
 
-        ProfWin* toclose = wins_get_by_string(args[0]);
+        ProfWin *toclose = wins_get_by_string(args[0]);
         if (!toclose) {
             cons_show("Window \"%s\" does not exist.", args[0]);
             return TRUE;
@@ -1501,7 +1483,7 @@ cmd_close(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_win(ProfWin* window, const char* const command, gchar** args)
+cmd_win(ProfWin *window, const char *const command, gchar **args)
 {
     gboolean is_num = TRUE;
     int i = 0;
@@ -1515,14 +1497,14 @@ cmd_win(ProfWin* window, const char* const command, gchar** args)
     if (is_num) {
         int num = atoi(args[0]);
 
-        ProfWin* focuswin = wins_get_by_num(num);
+        ProfWin *focuswin = wins_get_by_num(num);
         if (!focuswin) {
             cons_show("Window %d does not exist.", num);
         } else {
             ui_focus_win(focuswin);
         }
     } else {
-        ProfWin* focuswin = wins_get_by_string(args[0]);
+        ProfWin *focuswin = wins_get_by_string(args[0]);
         if (!focuswin) {
             cons_show("Window \"%s\" does not exist.", args[0]);
         } else {
@@ -1534,23 +1516,21 @@ cmd_win(ProfWin* window, const char* const command, gchar** args)
 }
 
 static void
-_cmd_list_commands(GList* commands)
-{
+_cmd_list_commands(GList *commands) {
     int maxlen = 0;
-    GList* curr = commands;
+    GList *curr = commands;
     while (curr) {
-        gchar* cmd = curr->data;
+        gchar *cmd = curr->data;
         int len = strlen(cmd);
-        if (len > maxlen)
-            maxlen = len;
+        if (len > maxlen) maxlen = len;
         curr = g_list_next(curr);
     }
 
-    GString* cmds = g_string_new("");
+    GString *cmds = g_string_new("");
     curr = commands;
     int count = 0;
     while (curr) {
-        gchar* cmd = curr->data;
+        gchar *cmd = curr->data;
         if (count == 5) {
             cons_show(cmds->str);
             g_string_free(cmds, TRUE);
@@ -1571,21 +1551,21 @@ _cmd_list_commands(GList* commands)
 }
 
 static void
-_cmd_help_cmd_list(const char* const tag)
+_cmd_help_cmd_list(const char *const tag)
 {
     cons_show("");
-    ProfWin* console = wins_get_console();
+    ProfWin *console = wins_get_console();
     if (tag) {
         win_println(console, THEME_HELP_HEADER, "-", "%s commands", tag);
     } else {
         win_println(console, THEME_HELP_HEADER, "-", "All commands");
     }
 
-    GList* ordered_commands = NULL;
+    GList *ordered_commands = NULL;
 
     if (g_strcmp0(tag, "plugins") == 0) {
-        GList* plugins_cmds = plugins_get_command_names();
-        GList* curr = plugins_cmds;
+        GList *plugins_cmds = plugins_get_command_names();
+        GList *curr = plugins_cmds;
         while (curr) {
             ordered_commands = g_list_insert_sorted(ordered_commands, curr->data, (GCompareFunc)g_strcmp0);
             curr = g_list_next(curr);
@@ -1596,8 +1576,8 @@ _cmd_help_cmd_list(const char* const tag)
 
         // add plugins if showing all commands
         if (!tag) {
-            GList* plugins_cmds = plugins_get_command_names();
-            GList* curr = plugins_cmds;
+            GList *plugins_cmds = plugins_get_command_names();
+            GList *curr = plugins_cmds;
             while (curr) {
                 ordered_commands = g_list_insert_sorted(ordered_commands, curr->data, (GCompareFunc)g_strcmp0);
                 curr = g_list_next(curr);
@@ -1611,7 +1591,7 @@ _cmd_help_cmd_list(const char* const tag)
 }
 
 gboolean
-cmd_help(ProfWin* window, const char* const command, gchar** args)
+cmd_help(ProfWin *window, const char *const command, gchar **args)
 {
     int num_args = g_strv_length(args);
     if (num_args == 0) {
@@ -1620,12 +1600,12 @@ cmd_help(ProfWin* window, const char* const command, gchar** args)
         if (args[1] == NULL) {
             cons_bad_cmd_usage(command);
         } else {
-            GList* cmds = cmd_search_index_all(args[1]);
+            GList *cmds = cmd_search_index_all(args[1]);
             if (cmds == NULL) {
                 cons_show("No commands found.");
             } else {
-                GList* curr = cmds;
-                GList* results = NULL;
+                GList *curr = cmds;
+                GList *results = NULL;
                 while (curr) {
                     results = g_list_insert_sorted(results, curr->data, (GCompareFunc)g_strcmp0);
                     curr = g_list_next(curr);
@@ -1640,12 +1620,12 @@ cmd_help(ProfWin* window, const char* const command, gchar** args)
         if (args[1] == NULL) {
             cons_bad_cmd_usage(command);
         } else {
-            GList* cmds = cmd_search_index_any(args[1]);
+            GList *cmds = cmd_search_index_any(args[1]);
             if (cmds == NULL) {
                 cons_show("No commands found.");
             } else {
-                GList* curr = cmds;
-                GList* results = NULL;
+                GList *curr = cmds;
+                GList *results = NULL;
                 while (curr) {
                     results = g_list_insert_sorted(results, curr->data, (GCompareFunc)g_strcmp0);
                     curr = g_list_next(curr);
@@ -1669,15 +1649,15 @@ cmd_help(ProfWin* window, const char* const command, gchar** args)
     } else if (strcmp(args[0], "navigation") == 0) {
         cons_navigation_help();
     } else {
-        char* cmd = args[0];
+        char *cmd = args[0];
         char cmd_with_slash[1 + strlen(cmd) + 1];
         sprintf(cmd_with_slash, "/%s", cmd);
 
-        Command* command = cmd_get(cmd_with_slash);
+        Command *command = cmd_get(cmd_with_slash);
         if (command) {
             cons_show_help(cmd_with_slash, &command->help);
         } else {
-            CommandHelp* commandHelp = plugins_get_help(cmd_with_slash);
+            CommandHelp *commandHelp = plugins_get_help(cmd_with_slash);
             if (commandHelp) {
                 cons_show_help(cmd_with_slash, commandHelp);
             } else {
@@ -1691,7 +1671,7 @@ cmd_help(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_about(ProfWin* window, const char* const command, gchar** args)
+cmd_about(ProfWin *window, const char *const command, gchar **args)
 {
     cons_show("");
     cons_about();
@@ -1699,7 +1679,7 @@ cmd_about(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_prefs(ProfWin* window, const char* const command, gchar** args)
+cmd_prefs(ProfWin *window, const char *const command, gchar **args)
 {
     if (args[0] == NULL) {
         cons_prefs();
@@ -1748,18 +1728,18 @@ cmd_prefs(ProfWin* window, const char* const command, gchar** args)
 }
 
 gboolean
-cmd_theme(ProfWin* window, const char* const command, gchar** args)
+cmd_theme(ProfWin *window, const char *const command, gchar **args)
 {
     // 'full-load' means to load the theme including the settings (not just [colours])
     gboolean fullload = (g_strcmp0(args[0], "full-load") == 0);
 
     // list themes
     if (g_strcmp0(args[0], "list") == 0) {
-        GSList* themes = theme_list();
+        GSList *themes = theme_list();
         cons_show_themes(themes);
         g_slist_free_full(themes, g_free);
 
-        // load a theme
+    // load a theme
     } else if (g_strcmp0(args[0], "load") == 0 || fullload) {
         if (args[1] == NULL) {
             cons_bad_cmd_usage(command);
@@ -1782,7 +1762,7 @@ cmd_theme(ProfWin* window, const char* const command, gchar** args)
             cons_show("Couldn't find theme: %s", args[1]);
         }
 
-        // show colours
+    // show colours
     } else if (g_strcmp0(args[0], "colours") == 0) {
         cons_theme_colours();
     } else if (g_strcmp0(args[0], "properties") == 0) {
@@ -1795,7 +1775,7 @@ cmd_theme(ProfWin* window, const char* const command, gchar** args)
 }
 
 static void
-_who_room(ProfWin* window, const char* const command, gchar** args)
+_who_room(ProfWin *window, const char *const command, gchar **args)
 {
     if ((g_strv_length(args) == 2) && args[1]) {
         cons_show("Argument group is not applicable to chat rooms.");
@@ -1803,30 +1783,53 @@ _who_room(ProfWin* window, const char* const command, gchar** args)
     }
 
     // bad arg
-    if (args[0] && (g_strcmp0(args[0], "online") != 0) && (g_strcmp0(args[0], "available") != 0) && (g_strcmp0(args[0], "unavailable") != 0) && (g_strcmp0(args[0], "away") != 0) && (g_strcmp0(args[0], "chat") != 0) && (g_strcmp0(args[0], "xa") != 0) && (g_strcmp0(args[0], "dnd") != 0) && (g_strcmp0(args[0], "any") != 0) && (g_strcmp0(args[0], "moderator") != 0) && (g_strcmp0(args[0], "participant") != 0) && (g_strcmp0(args[0], "visitor") != 0) && (g_strcmp0(args[0], "owner") != 0) && (g_strcmp0(args[0], "admin") != 0) && (g_strcmp0(args[0], "member") != 0) && (g_strcmp0(args[0], "outcast") != 0)) {
+    if (args[0] &&
+            (g_strcmp0(args[0], "online") != 0) &&
+            (g_strcmp0(args[0], "available") != 0) &&
+            (g_strcmp0(args[0], "unavailable") != 0) &&
+            (g_strcmp0(args[0], "away") != 0) &&
+            (g_strcmp0(args[0], "chat") != 0) &&
+            (g_strcmp0(args[0], "xa") != 0) &&
+            (g_strcmp0(args[0], "dnd") != 0) &&
+            (g_strcmp0(args[0], "any") != 0) &&
+            (g_strcmp0(args[0], "moderator") != 0) &&
+            (g_strcmp0(args[0], "participant") != 0) &&
+            (g_strcmp0(args[0], "visitor") != 0) &&
+            (g_strcmp0(args[0], "owner") != 0) &&
+            (g_strcmp0(args[0], "admin") != 0) &&
+            (g_strcmp0(args[0], "member") != 0) &&
+            (g_strcmp0(args[0], "outcast") != 0)) {
         cons_bad_cmd_usage(command);
         return;
     }
 
-    ProfMucWin* mucwin = (ProfMucWin*)window;
+    ProfMucWin *mucwin = (ProfMucWin*)window;
     assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
 
     // presence filter
-    if (args[0] == NULL || (g_strcmp0(args[0], "online") == 0) || (g_strcmp0(args[0], "available") == 0) || (g_strcmp0(args[0], "unavailable") == 0) || (g_strcmp0(args[0], "away") == 0) || (g_strcmp0(args[0], "chat") == 0) || (g_strcmp0(args[0], "xa") == 0) || (g_strcmp0(args[0], "dnd") == 0) || (g_strcmp0(args[0], "any") == 0)) {
-
-        char* presence = args[0];
-        GList* occupants = muc_roster(mucwin->roomjid);
+    if (args[0] == NULL ||
+            (g_strcmp0(args[0], "online") == 0) ||
+            (g_strcmp0(args[0], "available") == 0) ||
+            (g_strcmp0(args[0], "unavailable") == 0) ||
+            (g_strcmp0(args[0], "away") == 0) ||
+            (g_strcmp0(args[0], "chat") == 0) ||
+            (g_strcmp0(args[0], "xa") == 0) ||
+            (g_strcmp0(args[0], "dnd") == 0) ||
+            (g_strcmp0(args[0], "any") == 0)) {
+
+        char *presence = args[0];
+        GList *occupants = muc_roster(mucwin->roomjid);
 
         // no arg, show all contacts
         if ((presence == NULL) || (g_strcmp0(presence, "any") == 0)) {
             mucwin_roster(mucwin, occupants, NULL);
 
-            // available
+        // available
         } else if (strcmp("available", presence) == 0) {
-            GList* filtered = NULL;
+            GList *filtered = NULL;
 
             while (occupants) {
-                Occupant* occupant = occupants->data;
+                Occupant *occupant = occupants->data;
                 if (muc_occupant_available(occupant)) {
                     filtered = g_list_append(filtered, occupant);
                 }
@@ -1835,12 +1838,12 @@ _who_room(ProfWin* window, const char* const command, gchar** args)
 
             mucwin_roster(mucwin, filtered, "available");
 
-            // unavailable
+        // unavailable
         } else if (strcmp("unavailable", presence) == 0) {
-            GList* filtered = NULL;
+            GList *filtered = NULL;
 
             while (occupants) {
-                Occupant* occupant = occupants->data;
+                Occupant *occupant = occupants->data;
                 if (!muc_occupant_available(occupant)) {
                     filtered = g_list_append(filtered, occupant);
                 }
@@ -1849,13 +1852,13 @@ _who_room(ProfWin* window, const char* const command, gchar** args)
 
             mucwin_roster(mucwin, filtered, "unavailable");
 
-            // show specific status
+        // show specific status
         } else {
-            GList* filtered = NULL;
+            GList *filtered = NULL;
 
             while (occupants) {
-                Occupant* occupant = occupants->data;
-                const char* presence_str = string_from_resource_presence(occupant->presence);
+                Occupant *occupant = occupants->data;
+                const char *presence_str = string_from_resource_presence(occupant->presence);
                 if (strcmp(presence_str, presence) == 0) {
                     filtered = g_list_append(filtered, occupant);
                 }
@@ -1867,7 +1870,7 @@ _who_room(ProfWin* window, const char* const command, gchar** args)
 
<span class="subxS2Comment"># . . call</span>
<span id="L56" class="LineNr"> 56 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
<span id="L57" class="LineNr"> 57 </span>    <span class="subxS2Comment"># . . discard args</span>
<span id="L58" class="LineNr"> 58 </span>    81          0/subop/add         3/mod/direct    4/rm32/esp   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to esp</span>
<span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . _write(2/stderr, Newline)</span>
<span id="L60" class="LineNr"> 60 </span>    <span class="subxS2Comment"># . . push args</span>
<span id="L61" class="LineNr"> 61 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
<span id="L62" class="LineNr"> 62 </span>    68/push  2/imm32/stderr
<span id="L63" class="LineNr"> 63 </span>    <span class="subxS2Comment"># . . call</span>
<span id="L64" class="LineNr"> 64 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
<span id="L65" class="LineNr"> 65 </span>    <span class="subxS2Comment"># . . discard args</span>
<span id="L66" class="LineNr"> 66 </span>    81          0/subop/add         3/mod/direct    4/rm32/esp   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to esp</span>
<span id="L67" class="LineNr"> 67 </span>    <span class="subxComment"># increment Num-test-failures</span>
<span id="L68" class="LineNr"> 68 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='051test.subx.html#L90'>Num-test-failures</a></span>/disp32          <span class="subxComment"># increment *Num-test-failures</span>
<span id="L69" class="LineNr"> 69 </span><span class="Constant">$check-ints-equal:end</span>:
<span id="L70" class="LineNr"> 70 </span>    <span class="subxS1Comment"># . restore registers</span>
<span id="L71" class="LineNr"> 71 </span>    5b/pop-to-ebx
<span id="L72" class="LineNr"> 72 </span>    59/pop-to-ecx
<span id="L73" class="LineNr"> 73 </span>    58/pop-to-eax
<span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . epilogue</span>
<span id="L75" class="LineNr"> 75 </span>    89/copy                         3/mod/direct    4/rm32/esp   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/ebp  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ebp to esp</span>
<span id="L76" class="LineNr"> 76 </span>    5d/pop-to-ebp
<span id="L77" class="LineNr"> 77 </span>    c3/return
<span id="L78" class="LineNr"> 78 </span>
<span id="L79" class="LineNr"> 79 </span>== data
<span id="L80" class="LineNr"> 80 </span>
<span id="L81" class="LineNr"> 81 </span><span class="subxComment"># length-prefixed string containing just a single newline</span>
<span id="L82" class="LineNr"> 82 </span><span class="subxComment"># convenient to have when printing messages and so on</span>
<span id="L83" class="LineNr"> 83 </span><span class="SpecialChar">Newline</span>:  <span class="subxComment"># (array byte)</span>
<span id="L84" class="LineNr"> 84 </span>    <span class="subxComment"># size: int</span>
<span id="L85" class="LineNr"> 85 </span>    1/imm32
<span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># data</span>
<span id="L87" class="LineNr"> 87 </span>    0a/newline
<span id="L88" class="LineNr"> 88 </span>
<span id="L89" class="LineNr"> 89 </span><span class="subxComment"># every test failure increments this counter</span>
<span id="L90" class="LineNr"> 90 </span><span class="SpecialChar">Num-test-failures</span>:  <span class="subxComment"># int</span>
<span id="L91" class="LineNr"> 91 </span>    0/imm32
<span id="L92" class="LineNr"> 92 </span>
<span id="L93" class="LineNr"> 93 </span><span class="subxComment"># length-prefixed string containing just a single space</span>
<span id="L94" class="LineNr"> 94 </span><span class="SpecialChar">Space</span>:  <span class="subxComment"># (array byte)</span>
<span id="L95" class="LineNr"> 95 </span>    <span class="subxComment"># size: int</span>
<span id="L96" class="LineNr"> 96 </span>    1/imm32
<span id="L97" class="LineNr"> 97 </span>    <span class="subxComment"># data</span>
<span id="L98" class="LineNr"> 98 </span>    20/space
<span id="L99" class="LineNr"> 99 </span>
<span id="L100" class="LineNr">100 </span><span class="subxComment"># length-prefixed string containing just a single slash</span>
<span id="L101" class="LineNr">101 </span><span class="SpecialChar">Slash</span>:  <span class="subxComment"># (array byte)</span>
<span id="L102" class="LineNr">102 </span>    <span class="subxComment"># size: int</span>
<span id="L103" class="LineNr">103 </span>    1/imm32
<span id="L104" class="LineNr">104 </span>    <span class="subxComment"># data</span>
<span id="L105" class="LineNr">105 </span>    2f/slash
<span id="L106" class="LineNr">106 </span>
<span id="L107" class="LineNr">107 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
</pre>
</body>
</html>
<!-- vim: set foldmethod=manual : -->