Applied coding style to src/

src/chat_session.c

@@ -46,8 +46,8 @@
 static GHashTable *sessions;
 
 static void
-_chat_session_new(const char * const barejid, const char * const resource,
+_chat_session_new(const char *const barejid, const char *const resource, gboolean resource_override,
-    gboolean resource_override, gboolean send_states)
+    gboolean send_states)
 {
     assert(barejid != NULL);
     assert(resource != NULL);

src/chat_session.h

@@ -51,8 +51,7 @@ void chat_sessions_clear(void);
 void chat_session_resource_override(const char *const barejid, const char *const resource);
 ChatSession* chat_session_get(const char *const barejid);
 
-void chat_session_recipient_active(const char *const barejid, const char *const resource,
+void chat_session_recipient_active(const char *const barejid, const char *const resource, gboolean send_states);
-    gboolean send_states);
 void chat_session_recipient_typing(const char *const barejid, const char *const resource);
 void chat_session_recipient_paused(const char *const barejid, const char *const resource);
 void chat_session_recipient_gone(const char *const barejid, const char *const resource);

src/common.c

@@ -310,7 +310,7 @@ prof_getline(FILE *stream)
 }
 
 char*
-release_get_latest()
+release_get_latest(void)
 {
     char *url = "http://www.profanity.im/profanity_version.txt";
 

src/common.h

@@ -102,8 +102,7 @@ gboolean p_hash_table_contains(GHashTable *hash_table, gconstpointer key);
 
 gboolean create_dir(char *name);
 gboolean mkdir_recursive(const char *dir);
-char* str_replace(const char *string, const char *substr,
+char* str_replace(const char *string, const char *substr, const char *replacement);
-    const char *replacement);
 gboolean str_contains_str(const char *const searchstr, const char *const substr);
 int str_contains(const char str[], int size, char ch);
 gboolean strtoi_range(char *str, int *saveptr, int min, int max, char **err_msg);

src/contact.h

@@ -40,9 +40,8 @@
 
 typedef struct p_contact_t *PContact;
 
-PContact p_contact_new(const char *const barejid, const char *const name,
+PContact p_contact_new(const char *const barejid, const char *const name, GSList *groups,
-    GSList *groups, const char *const subscription,
+    const char *const subscription, const char *const offline_message, gboolean pending_out);
-    const char *const offline_message, gboolean pending_out);
 void p_contact_add_resource(PContact contact, Resource *resource);
 gboolean p_contact_remove_resource(PContact contact, const char *const resource);
 void p_contact_free(PContact contact);

src/log.c

@@ -82,16 +82,15 @@ static struct dated_chat_log * _create_log(const char * const other, const  char
 static struct dated_chat_log* _create_groupchat_log(char *room, const char *const login);
 static void _free_chat_log(struct dated_chat_log *dated_log);
 static gboolean _key_equals(void *key1, void *key2);
-static char * _get_log_filename(const char * const other, const char * const login,
+static char* _get_log_filename(const char *const other, const char *const login, GDateTime *dt, gboolean create);
-    GDateTime *dt, gboolean create);
+static char* _get_groupchat_log_filename(const char *const room, const char *const login, GDateTime *dt,
-static char * _get_groupchat_log_filename(const char * const room,
+    gboolean create);
-    const char * const login, GDateTime *dt, gboolean create);
 static gchar* _get_chatlog_dir(void);
 static gchar* _get_main_log_file(void);
 static void _rotate_log_file(void);
 static char* _log_string_from_level(log_level_t level);
-static void _chat_log_chat(const char * const login, const char * const other,
+static void _chat_log_chat(const char *const login, const char *const other, const gchar *const msg,
-    const gchar * const msg, chat_log_direction_t direction, GDateTime *timestamp);
+    chat_log_direction_t direction, GDateTime *timestamp);
 
 void
 log_debug(const char *const msg, ...)
@@ -353,8 +352,8 @@ chat_log_msg_in(const char * const barejid, const char * const msg, GDateTime *t
 }
 
 static void
-_chat_log_chat(const char * const login, const char * const other,
+_chat_log_chat(const char *const login, const char *const other, const char *const msg,
-    const char * const msg, chat_log_direction_t direction, GDateTime *timestamp)
+    chat_log_direction_t direction, GDateTime *timestamp)
 {
     struct dated_chat_log *dated_log = g_hash_table_lookup(logs, other);
 
@@ -404,8 +403,7 @@ _chat_log_chat(const char * const login, const char * const other,
 }
 
 void
-groupchat_log_chat(const gchar * const login, const gchar * const room,
+groupchat_log_chat(const gchar *const login, const gchar *const room, const gchar *const nick, const gchar *const msg)
-    const gchar * const nick, const gchar * const msg)
 {
     gchar *room_copy = strdup(room);
     struct dated_chat_log *dated_log = g_hash_table_lookup(groupchat_logs, room_copy);
@@ -572,8 +570,7 @@ gboolean _key_equals(void *key1, void *key2)
 }
 
 static char*
-_get_log_filename(const char * const other, const char * const login,
+_get_log_filename(const char *const other, const char *const login, GDateTime *dt, gboolean create)
-    GDateTime *dt, gboolean create)
 {
     gchar *chatlogs_dir = _get_chatlog_dir();
     GString *log_file = g_string_new(chatlogs_dir);
@@ -604,8 +601,7 @@ _get_log_filename(const char * const other, const char * const login,
 }
 
 static char*
-_get_groupchat_log_filename(const char * const room, const char * const login,
+_get_groupchat_log_filename(const char *const room, const char *const login, GDateTime *dt, gboolean create)
-    GDateTime *dt, gboolean create)
 {
     gchar *chatlogs_dir = _get_chatlog_dir();
     GString *log_file = g_string_new(chatlogs_dir);

src/log.h

@@ -59,8 +59,7 @@ void log_debug(const char *const msg, ...);
 void log_info(const char *const msg, ...);
 void log_warning(const char *const msg, ...);
 void log_error(const char *const msg, ...);
-void log_msg(log_level_t level, const char *const area,
+void log_msg(log_level_t level, const char *const area, const char *const msg);
-    const char *const msg);
 log_level_t log_level_from_string(char *log_level);
 
 void log_stderr_init(log_level_t level);
@@ -78,10 +77,10 @@ void chat_log_otr_msg_in(const char *const barejid, const char *const msg, gbool
 void chat_log_pgp_msg_in(const char *const barejid, const char *const msg, GDateTime *timestamp);
 
 void chat_log_close(void);
-GSList* chat_log_get_previous(const gchar *const login,
+GSList* chat_log_get_previous(const gchar *const login, const gchar *const recipient);
-    const gchar *const recipient);
 
 void groupchat_log_init(void);
-void groupchat_log_chat(const gchar *const login, const gchar *const room,
+void groupchat_log_chat(const gchar *const login, const gchar *const room, const gchar *const nick,
-    const gchar *const nick, const gchar *const msg);
+    const gchar *const msg);
+
 #endif

src/muc.c

@@ -76,8 +76,8 @@ static muc_role_t _role_from_string(const char * const role);
 static muc_affiliation_t _affiliation_from_string(const char *const affiliation);
 static char* _role_to_string(muc_role_t role);
 static char* _affiliation_to_string(muc_affiliation_t affiliation);
-static Occupant* _muc_occupant_new(const char *const nick, const char * const jid,
+static Occupant* _muc_occupant_new(const char *const nick, const char *const jid, muc_role_t role,
-    muc_role_t role, muc_affiliation_t affiliation, resource_presence_t presence, const char * const status);
+    muc_affiliation_t affiliation, resource_presence_t presence, const char *const status);
 static void _occupant_free(Occupant *occupant);
 
 void
@@ -172,8 +172,7 @@ muc_invites_clear(void)
 }
 
 void
-muc_join(const char * const room, const char * const nick,
+muc_join(const char *const room, const char *const nick, const char *const password, gboolean autojoin)
-    const char * const password, gboolean autojoin)
 {
     ChatRoom *new_room = malloc(sizeof(ChatRoom));
     new_room->room = strdup(room);
@@ -425,8 +424,8 @@ muc_roster_contains_nick(const char * const room, const char * const nick)
  * Add a new chat room member to the room's roster
  */
 gboolean
-muc_roster_add(const char * const room, const char * const nick, const char * const jid,
+muc_roster_add(const char *const room, const char *const nick, const char *const jid, const char *const role,
-    const char * const role, const char * const affiliation, const char * const show, const char * const status)
+    const char *const affiliation, const char *const show, const char *const status)
 {
     ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
     gboolean updated = FALSE;
@@ -631,8 +630,7 @@ muc_occupants_by_affiliation(const char * const room, muc_affiliation_t affiliat
  * is in progress
  */
 void
-muc_occupant_nick_change_start(const char * const room,
+muc_occupant_nick_change_start(const char *const room, const char *const new_nick, const char *const old_nick)
-    const char * const new_nick, const char * const old_nick)
 {
     ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
     if (chat_room) {
@@ -648,8 +646,7 @@ muc_occupant_nick_change_start(const char * const room,
  * the caller
  */
 char*
-muc_roster_nick_change_complete(const char * const room,
+muc_roster_nick_change_complete(const char *const room, const char *const nick)
-    const char * const nick)
 {
     ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
     if (chat_room) {
@@ -832,8 +829,8 @@ _free_room(ChatRoom *room)
     }
 }
 
-static
+static gint
-gint _compare_occupants(Occupant *a, Occupant *b)
+_compare_occupants(Occupant *a, Occupant *b)
 {
     const char * utf8_str_a = a->nick_collate_key;
     const char * utf8_str_b = b->nick_collate_key;
@@ -937,8 +934,8 @@ _affiliation_to_string(muc_affiliation_t affiliation)
 }
 
 static Occupant*
-_muc_occupant_new(const char *const nick, const char * const jid, muc_role_t role, muc_affiliation_t affiliation, resource_presence_t presence,
+_muc_occupant_new(const char *const nick, const char *const jid, muc_role_t role, muc_affiliation_t affiliation,
-    const char * const status)
+    resource_presence_t presence, const char *const status)
 {
     Occupant *occupant = malloc(sizeof(Occupant));
 

src/muc.h

@@ -96,9 +96,8 @@ char* muc_old_nick(const char *const room, const char *const new_nick);
 
 gboolean muc_roster_contains_nick(const char *const room, const char *const nick);
 gboolean muc_roster_complete(const char *const room);
-gboolean muc_roster_add(const char *const room, const char *const nick, const char *const jid,
+gboolean muc_roster_add(const char *const room, const char *const nick, const char *const jid, const char *const role,
-    const char *const role, const char *const affiliation, const char *const show,
+    const char *const affiliation, const char *const show, const char *const status);
-    const char *const status);
 void muc_roster_remove(const char *const room, const char *const nick);
 void muc_roster_set_complete(const char *const room);
 GList* muc_roster(const char *const room);

src/profanity.c

@@ -177,7 +177,7 @@ _connect_default(const char * const account)
 }
 
 static void
-_check_autoaway()
+_check_autoaway(void)
 {
     jabber_conn_status_t conn_status = jabber_get_connection_status();
     if (conn_status != JABBER_CONNECTED) {

src/resource.c

@@ -39,8 +39,8 @@
 #include <common.h>
 #include <resource.h>
 
-Resource * resource_new(const char * const name, resource_presence_t presence,
+Resource*
-    const char * const status, const int priority)
+resource_new(const char *const name, resource_presence_t presence, const char *const status, const int priority)
 {
     assert(name != NULL);
     Resource *new_resource = malloc(sizeof(struct resource_t));
@@ -86,7 +86,8 @@ resource_compare_availability(Resource *first, Resource *second)
     }
 }
 
-void resource_destroy(Resource *resource)
+void
+resource_destroy(Resource *resource)
 {
     if (resource) {
         free(resource->name);

src/resource.h

@@ -44,10 +44,9 @@ typedef struct resource_t {
     int priority;
 } Resource;
 
-Resource* resource_new(const char *const name, resource_presence_t presence,
+Resource* resource_new(const char *const name, resource_presence_t presence, const char *const status,
-    const char *const status, const int priority);
+    const int priority);
 void resource_destroy(Resource *resource);
-
 int resource_compare_availability(Resource *first, Resource *second);
 
 #endif

src/roster_list.c

@@ -64,10 +64,8 @@ static GHashTable *name_to_barejid;
 
 static gboolean _key_equals(void *key1, void *key2);
 static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2);
-static void _replace_name(const char * const current_name,
+static void _replace_name(const char *const current_name, const char *const new_name, const char *const barejid);
-    const char * const new_name, const char * const barejid);
+static void _add_name_and_barejid(const char *const name, const char *const barejid);
-static void _add_name_and_barejid(const char * const name,
-    const char * const barejid);
 static gint _compare_contacts(PContact a, PContact b);
 
 void
@@ -86,8 +84,7 @@ roster_clear(void)
 }
 
 gboolean
-roster_update_presence(const char * const barejid, Resource *resource,
+roster_update_presence(const char *const barejid, Resource *resource, GDateTime *last_activity)
-    GDateTime *last_activity)
 {
     assert(barejid != NULL);
     assert(resource != NULL);
@@ -145,8 +142,7 @@ roster_get_msg_display_name(const char * const barejid, const char * const resou
 }
 
 gboolean
-roster_contact_offline(const char * const barejid,
+roster_contact_offline(const char *const barejid, const char *const resource, const char *const status)
-    const char * const resource, const char * const status)
 {
     PContact contact = roster_get_contact(barejid);
 
@@ -241,8 +237,8 @@ roster_remove(const char * const name, const char * const barejid)
 }
 
 void
-roster_update(const char * const barejid, const char * const name,
+roster_update(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
-    GSList *groups, const char * const subscription, gboolean pending_out)
+    gboolean pending_out)
 {
     PContact contact = roster_get_contact(barejid);
     assert(contact != NULL);
@@ -268,8 +264,8 @@ roster_update(const char * const barejid, const char * const name,
 }
 
 gboolean
-roster_add(const char * const barejid, const char * const name, GSList *groups,
+roster_add(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
-    const char * const subscription, gboolean pending_out)
+    gboolean pending_out)
 {
     PContact contact = roster_get_contact(barejid);
     if (contact) {
@@ -449,8 +445,8 @@ roster_barejid_autocomplete(const char * const search_str)
     return autocomplete_complete(barejid_ac, search_str, TRUE);
 }
 
-static
+static gboolean
-gboolean _key_equals(void *key1, void *key2)
+_key_equals(void *key1, void *key2)
 {
     gchar *str1 = (gchar *) key1;
     gchar *str2 = (gchar *) key2;
@@ -473,8 +469,7 @@ _datetimes_equal(GDateTime *dt1, GDateTime *dt2)
 }
 
 static void
-_replace_name(const char * const current_name, const char * const new_name,
+_replace_name(const char *const current_name, const char *const new_name, const char *const barejid)
-    const char * const barejid)
 {
     // current handle exists already
     if (current_name) {
@@ -501,8 +496,8 @@ _add_name_and_barejid(const char * const name, const char * const barejid)
     }
 }
 
-static
+static gint
-gint _compare_contacts(PContact a, PContact b)
+_compare_contacts(PContact a, PContact b)
 {
     const char * utf8_str_a = NULL;
     const char * utf8_str_b = NULL;

src/roster_list.h

@@ -41,20 +41,18 @@
 #include "contact.h"
 
 void roster_clear(void);
-gboolean roster_update_presence(const char *const barejid, Resource *resource,
+gboolean roster_update_presence(const char *const barejid, Resource *resource, GDateTime *last_activity);
-    GDateTime *last_activity);
 PContact roster_get_contact(const char *const barejid);
-gboolean roster_contact_offline(const char *const barejid,
+gboolean roster_contact_offline(const char *const barejid, const char *const resource, const char *const status);
-    const char *const resource, const char *const status);
 void roster_reset_search_attempts(void);
 void roster_init(void);
 void roster_free(void);
 void roster_change_name(PContact contact, const char *const new_name);
 void roster_remove(const char *const name, const char *const barejid);
-void roster_update(const char *const barejid, const char *const name,
+void roster_update(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
-    GSList *groups, const char *const subscription, gboolean pending_out);
+    gboolean pending_out);
-gboolean roster_add(const char *const barejid, const char *const name, GSList *groups,
+gboolean roster_add(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
-    const char *const subscription, gboolean pending_out);
+    gboolean pending_out);
 char* roster_barejid_from_name(const char *const name);
 GSList* roster_get_contacts(void);
 GSList* roster_get_contacts_online(void);