From afbd2693cd966525b1a0625540b208a33d44b40e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 25 Oct 2015 22:32:46 +0000
Subject: Applied coding style to src/event/

---
 src/event/client_events.c | 10 +++----
 src/event/client_events.h | 10 +++----
 src/event/server_events.c | 73 +++++++++++++++++++++++------------------------
 src/event/server_events.h | 71 +++++++++++++++++++++++----------------------
 src/event/ui_events.c     |  4 +--
 src/event/ui_events.h     |  6 ++--
 6 files changed, 86 insertions(+), 88 deletions(-)

(limited to 'src')

diff --git a/src/event/client_events.c b/src/event/client_events.c
index 8f744c7e..ec9516a2 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -48,7 +48,7 @@
 #endif
 
 jabber_conn_status_t
-cl_ev_connect_jid(const char * const jid, const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy)
+cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy)
 {
     cons_show("Connecting as %s", jid);
     return jabber_connect_with_details(jid, passwd, altdomain, port, tls_policy);
@@ -65,7 +65,7 @@ cl_ev_connect_account(ProfAccount *account)
 }
 
 void
-cl_ev_presence_send(const resource_presence_t presence_type, const char * const msg, const int idle_secs)
+cl_ev_presence_send(const resource_presence_t presence_type, const char *const msg, const int idle_secs)
 {
     char *signed_status = NULL;
 
@@ -84,7 +84,7 @@ cl_ev_presence_send(const resource_presence_t presence_type, const char * const
 }
 
 void
-cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
+cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg)
 {
     chat_state_active(chatwin->state);
 
@@ -154,13 +154,13 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
 }
 
 void
-cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg)
+cl_ev_send_muc_msg(ProfMucWin *mucwin, const char *const msg)
 {
     message_send_groupchat(mucwin->roomjid, msg);
 }
 
 void
-cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char * const msg)
+cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char *const msg)
 {
     message_send_private(privwin->fulljid, msg);
     ui_outgoing_private_msg(privwin, msg);
diff --git a/src/event/client_events.h b/src/event/client_events.h
index dbd053f3..11d1fb38 100644
--- a/src/event/client_events.h
+++ b/src/event/client_events.h
@@ -35,13 +35,13 @@
 #ifndef CLIENT_EVENTS_H
 #define CLIENT_EVENTS_H
 
-jabber_conn_status_t cl_ev_connect_jid(const char * const jid, const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy);
+jabber_conn_status_t cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy);
 jabber_conn_status_t cl_ev_connect_account(ProfAccount *account);
 
-void cl_ev_presence_send(const resource_presence_t presence_type, const char * const msg, const int idle_secs);
+void cl_ev_presence_send(const resource_presence_t presence_type, const char *const msg, const int idle_secs);
 
-void cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg);
-void cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg);
-void cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char * const msg);
+void cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg);
+void cl_ev_send_muc_msg(ProfMucWin *mucwin, const char *const msg);
+void cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char *const msg);
 
 #endif
diff --git a/src/event/server_events.c b/src/event/server_events.c
index f46f14ad..d58633ce 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -123,8 +123,8 @@ sv_ev_failed_login(void)
 
 void
 sv_ev_room_invite(jabber_invite_t invite_type,
-    const char * const invitor, const char * const room,
-    const char * const reason, const char * const password)
+    const char *const invitor, const char *const room,
+    const char *const reason, const char *const password)
 {
     if (!muc_active(room) && !muc_invites_contain(room)) {
         cons_show_room_invite(invitor, room, reason);
@@ -133,8 +133,7 @@ sv_ev_room_invite(jabber_invite_t invite_type,
 }
 
 void
-sv_ev_room_broadcast(const char *const room_jid,
-    const char * const message)
+sv_ev_room_broadcast(const char *const room_jid, const char *const message)
 {
     if (muc_roster_complete(room_jid)) {
         ui_room_broadcast(room_jid, message);
@@ -144,7 +143,7 @@ sv_ev_room_broadcast(const char *const room_jid,
 }
 
 void
-sv_ev_room_subject(const char * const room, const char * const nick, const char * const subject)
+sv_ev_room_subject(const char *const room, const char *const nick, const char *const subject)
 {
     muc_set_subject(room, subject);
     if (muc_roster_complete(room)) {
@@ -153,15 +152,15 @@ sv_ev_room_subject(const char * const room, const char * const nick, const char
 }
 
 void
-sv_ev_room_history(const char * const room_jid, const char * const nick,
-    GDateTime *timestamp, const char * const message)
+sv_ev_room_history(const char *const room_jid, const char *const nick,
+    GDateTime *timestamp, const char *const message)
 {
     ui_room_history(room_jid, nick, timestamp, message);
 }
 
 void
-sv_ev_room_message(const char * const room_jid, const char * const nick,
-    const char * const message)
+sv_ev_room_message(const char *const room_jid, const char *const nick,
+    const char *const message)
 {
     ui_room_message(room_jid, nick, message);
 
@@ -173,7 +172,7 @@ sv_ev_room_message(const char * const room_jid, const char * const nick,
 }
 
 void
-sv_ev_incoming_private_message(const char * const fulljid, char *message)
+sv_ev_incoming_private_message(const char *const fulljid, char *message)
 {
     ui_incoming_private_msg(fulljid, message, NULL);
 }
@@ -304,7 +303,7 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_m
 }
 
 void
-sv_ev_delayed_private_message(const char * const fulljid, char *message, GDateTime *timestamp)
+sv_ev_delayed_private_message(const char *const fulljid, char *message, GDateTime *timestamp)
 {
     ui_incoming_private_msg(fulljid, message, timestamp);
 }
@@ -341,7 +340,7 @@ sv_ev_inactive(char *barejid, char *resource)
 }
 
 void
-sv_ev_gone(const char * const barejid, const char * const resource)
+sv_ev_gone(const char *const barejid, const char *const resource)
 {
     ui_recipient_gone(barejid, resource);
     if (ui_chat_win_exists(barejid)) {
@@ -350,7 +349,7 @@ sv_ev_gone(const char * const barejid, const char * const resource)
 }
 
 void
-sv_ev_activity(const char * const barejid, const char * const resource, gboolean send_states)
+sv_ev_activity(const char *const barejid, const char *const resource, gboolean send_states)
 {
     if (ui_chat_win_exists(barejid)) {
         chat_session_recipient_active(barejid, resource, send_states);
@@ -419,44 +418,44 @@ sv_ev_contact_online(char *barejid, Resource *resource, GDateTime *last_activity
 }
 
 void
-sv_ev_leave_room(const char * const room)
+sv_ev_leave_room(const char *const room)
 {
     muc_leave(room);
     ui_leave_room(room);
 }
 
 void
-sv_ev_room_destroy(const char * const room)
+sv_ev_room_destroy(const char *const room)
 {
     muc_leave(room);
     ui_room_destroy(room);
 }
 
 void
-sv_ev_room_destroyed(const char * const room, const char * const new_jid, const char * const password,
-    const char * const reason)
+sv_ev_room_destroyed(const char *const room, const char *const new_jid, const char *const password,
+    const char *const reason)
 {
     muc_leave(room);
     ui_room_destroyed(room, reason, new_jid, password);
 }
 
 void
-sv_ev_room_kicked(const char * const room, const char * const actor, const char * const reason)
+sv_ev_room_kicked(const char *const room, const char *const actor, const char *const reason)
 {
     muc_leave(room);
     ui_room_kicked(room, actor, reason);
 }
 
 void
-sv_ev_room_banned(const char * const room, const char * const actor, const char * const reason)
+sv_ev_room_banned(const char *const room, const char *const actor, const char *const reason)
 {
     muc_leave(room);
     ui_room_banned(room, actor, reason);
 }
 
 void
-sv_ev_room_occupant_offline(const char * const room, const char * const nick,
-    const char * const show, const char * const status)
+sv_ev_room_occupant_offline(const char *const room, const char *const nick,
+    const char *const show, const char *const status)
 {
     muc_roster_remove(room, nick);
 
@@ -469,8 +468,8 @@ sv_ev_room_occupant_offline(const char * const room, const char * const nick,
 }
 
 void
-sv_ev_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor,
-    const char * const reason)
+sv_ev_room_occupent_kicked(const char *const room, const char *const nick, const char *const actor,
+    const char *const reason)
 {
     muc_roster_remove(room, nick);
     ui_room_member_kicked(room, nick, actor, reason);
@@ -478,8 +477,8 @@ sv_ev_room_occupent_kicked(const char * const room, const char * const nick, con
 }
 
 void
-sv_ev_room_occupent_banned(const char * const room, const char * const nick, const char * const actor,
-    const char * const reason)
+sv_ev_room_occupent_banned(const char *const room, const char *const nick, const char *const actor,
+    const char *const reason)
 {
     muc_roster_remove(room, nick);
     ui_room_member_banned(room, nick, actor, reason);
@@ -487,23 +486,23 @@ sv_ev_room_occupent_banned(const char * const room, const char * const nick, con
 }
 
 void
-sv_ev_roster_update(const char * const barejid, const char * const name,
-    GSList *groups, const char * const subscription, gboolean pending_out)
+sv_ev_roster_update(const char *const barejid, const char *const name,
+    GSList *groups, const char *const subscription, gboolean pending_out)
 {
     roster_update(barejid, name, groups, subscription, pending_out);
     rosterwin_roster();
 }
 
 void
-sv_ev_xmpp_stanza(const char * const msg)
+sv_ev_xmpp_stanza(const char *const msg)
 {
     ui_handle_stanza(msg);
 }
 
 void
-sv_ev_muc_self_online(const char * const room, const char * const nick, gboolean config_required,
-    const char * const role, const char * const affiliation, const char * const actor, const char * const reason,
-    const char * const jid, const char * const show, const char * const status)
+sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean config_required,
+    const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
+    const char *const jid, const char *const show, const char *const status)
 {
     muc_roster_add(room, nick, jid, role, affiliation, show, status);
     char *old_role = muc_role_str(room);
@@ -578,9 +577,9 @@ sv_ev_muc_self_online(const char * const room, const char * const nick, gboolean
 }
 
 void
-sv_ev_muc_occupant_online(const char * const room, const char * const nick, const char * const jid,
-    const char * const role, const char * const affiliation, const char * const actor, const char * const reason,
-    const char * const show, const char * const status)
+sv_ev_muc_occupant_online(const char *const room, const char *const nick, const char *const jid,
+    const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
+    const char *const show, const char *const status)
 {
     Occupant *occupant = muc_roster_item(room, nick);
 
@@ -648,8 +647,8 @@ sv_ev_muc_occupant_online(const char * const room, const char * const nick, cons
 }
 
 int
-sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp,
-    const char * const notbefore, const char * const notafter)
+sv_ev_certfail(const char *const errormsg, const char *const certname, const char *const certfp,
+    const char *const notbefore, const char *const notafter)
 {
     if (tlscerts_exists(certfp)) {
         return 1;
@@ -739,7 +738,7 @@ sv_ev_certfail(const char * const errormsg, const char * const certname, const c
 }
 
 void
-sv_ev_lastactivity_response(const char * const from, const int seconds, const char * const msg)
+sv_ev_lastactivity_response(const char *const from, const int seconds, const char *const msg)
 {
     Jid *jidp = jid_create(from);
 
diff --git a/src/event/server_events.h b/src/event/server_events.h
index 9ec08e6b..73c2ec03 100644
--- a/src/event/server_events.h
+++ b/src/event/server_events.h
@@ -41,53 +41,52 @@ void sv_ev_login_account_success(char *account_name, int secured);
 void sv_ev_lost_connection(void);
 void sv_ev_failed_login(void);
 void sv_ev_room_invite(jabber_invite_t invite_type,
-    const char * const invitor, const char * const room,
-    const char * const reason, const char * const password);
-void sv_ev_room_broadcast(const char *const room_jid,
-    const char * const message);
-void sv_ev_room_subject(const char * const room, const char * const nick, const char * const subject);
-void sv_ev_room_history(const char * const room_jid, const char * const nick,
-    GDateTime *timestamp, const char * const message);
-void sv_ev_room_message(const char * const room_jid, const char * const nick,
-    const char * const message);
+    const char *const invitor, const char *const room,
+    const char *const reason, const char *const password);
+void sv_ev_room_broadcast(const char *const room_jid, const char *const message);
+void sv_ev_room_subject(const char *const room, const char *const nick, const char *const subject);
+void sv_ev_room_history(const char *const room_jid, const char *const nick,
+    GDateTime *timestamp, const char *const message);
+void sv_ev_room_message(const char *const room_jid, const char *const nick,
+    const char *const message);
 void sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_message, GDateTime *timestamp);
-void sv_ev_incoming_private_message(const char * const fulljid, char *message);
-void sv_ev_delayed_private_message(const char * const fulljid, char *message, GDateTime *timestamp);
+void sv_ev_incoming_private_message(const char *const fulljid, char *message);
+void sv_ev_delayed_private_message(const char *const fulljid, char *message, GDateTime *timestamp);
 void sv_ev_typing(char *barejid, char *resource);
 void sv_ev_paused(char *barejid, char *resource);
 void sv_ev_inactive(char *barejid, char *resource);
 void sv_ev_activity(char *barejid, char *resource, gboolean send_states);
-void sv_ev_gone(const char * const barejid, const char * const resource);
+void sv_ev_gone(const char *const barejid, const char *const resource);
 void sv_ev_subscription(const char *from, jabber_subscr_t type);
 void sv_ev_message_receipt(char *barejid, char *id);
 void sv_ev_contact_offline(char *contact, char *resource, char *status);
 void sv_ev_contact_online(char *contact, Resource *resource, GDateTime *last_activity, char *pgpkey);
-void sv_ev_leave_room(const char * const room);
-void sv_ev_room_destroy(const char * const room);
-void sv_ev_room_occupant_offline(const char * const room, const char * const nick,
-    const char * const show, const char * const status);
-void sv_ev_room_destroyed(const char * const room, const char * const new_jid, const char * const password,
-    const char * const reason);
-void sv_ev_room_kicked(const char * const room, const char * const actor, const char * const reason);
-void sv_ev_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor,
-    const char * const reason);
-void sv_ev_room_banned(const char * const room, const char * const actor, const char * const reason);
-void sv_ev_room_occupent_banned(const char * const room, const char * const nick, const char * const actor,
-    const char * const reason);
+void sv_ev_leave_room(const char *const room);
+void sv_ev_room_destroy(const char *const room);
+void sv_ev_room_occupant_offline(const char *const room, const char *const nick,
+    const char *const show, const char *const status);
+void sv_ev_room_destroyed(const char *const room, const char *const new_jid, const char *const password,
+    const char *const reason);
+void sv_ev_room_kicked(const char *const room, const char *const actor, const char *const reason);
+void sv_ev_room_occupent_kicked(const char *const room, const char *const nick, const char *const actor,
+    const char *const reason);
+void sv_ev_room_banned(const char *const room, const char *const actor, const char *const reason);
+void sv_ev_room_occupent_banned(const char *const room, const char *const nick, const char *const actor,
+    const char *const reason);
 void sv_ev_outgoing_carbon(char *barejid, char *message);
 void sv_ev_incoming_carbon(char *barejid, char *resource, char *message);
-void sv_ev_xmpp_stanza(const char * const msg);
-void sv_ev_muc_self_online(const char * const room, const char * const nick, gboolean config_required,
-    const char * const role, const char * const affiliation, const char * const actor, const char * const reason,
-    const char * const jid, const char * const show, const char * const status);
-void sv_ev_muc_occupant_online(const char * const room, const char * const nick, const char * const jid,
-    const char * const role, const char * const affiliation, const char * const actor, const char * const reason,
-    const char * const show_str, const char * const status_str);
-void sv_ev_roster_update(const char * const barejid, const char * const name,
-    GSList *groups, const char * const subscription, gboolean pending_out);
+void sv_ev_xmpp_stanza(const char *const msg);
+void sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean config_required,
+    const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
+    const char *const jid, const char *const show, const char *const status);
+void sv_ev_muc_occupant_online(const char *const room, const char *const nick, const char *const jid,
+    const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
+    const char *const show_str, const char *const status_str);
+void sv_ev_roster_update(const char *const barejid, const char *const name,
+    GSList *groups, const char *const subscription, gboolean pending_out);
 void sv_ev_roster_received(void);
-int sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp,
-    const char * const notbefore, const char * const notafter);
-void sv_ev_lastactivity_response(const char * const from, const int seconds, const char * const msg);
+int sv_ev_certfail(const char *const errormsg, const char *const certname, const char *const certfp,
+    const char *const notbefore, const char *const notafter);
+void sv_ev_lastactivity_response(const char *const from, const int seconds, const char *const msg);
 
 #endif
diff --git a/src/event/ui_events.c b/src/event/ui_events.c
index 11296739..a9e71bbd 100644
--- a/src/event/ui_events.c
+++ b/src/event/ui_events.c
@@ -44,13 +44,13 @@ ui_ev_focus_win(ProfWin *win)
 }
 
 ProfChatWin*
-ui_ev_new_chat_win(const char * const barejid)
+ui_ev_new_chat_win(const char *const barejid)
 {
     return ui_new_chat_win(barejid);
 }
 
 ProfPrivateWin*
-ui_ev_new_private_win(const char * const fulljid)
+ui_ev_new_private_win(const char *const fulljid)
 {
     return ui_new_private_win(fulljid);
 }
diff --git a/src/event/ui_events.h b/src/event/ui_events.h
index 3f7fed02..279d1e2a 100644
--- a/src/event/ui_events.h
+++ b/src/event/ui_events.h
@@ -36,7 +36,7 @@
 #define UI_EVENTS_H
 
 void ui_ev_focus_win(ProfWin *win);
-ProfChatWin* ui_ev_new_chat_win(const char * const barejid);
-ProfPrivateWin* ui_ev_new_private_win(const char * const fulljid);
+ProfChatWin* ui_ev_new_chat_win(const char *const barejid);
+ProfPrivateWin* ui_ev_new_private_win(const char *const fulljid);
 
-#endif
\ No newline at end of file
+#endif
-- 
cgit 1.4.1-2-gfad0