devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-26 06:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

jabber: removed 'from' from message type handler function parameters

Browse Source
This commit is contained in:
James Booth
2012-11-07 00:42:12 +00:00
parent 30b1499c67
commit 444be385a6
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/jabber.c
View File

@@ -62,12 +62,9 @@ static void _connection_handler(xmpp_conn_t * const conn,
static int _message_handler(xmpp_conn_t * const conn, static int _message_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata); xmpp_stanza_t * const stanza, void * const userdata);
static int _groupchat_message_handler(const char * const room_jid, static int _groupchat_message_handler(xmpp_stanza_t * const stanza);
xmpp_stanza_t * const stanza); static int _error_message_handler(xmpp_stanza_t * const stanza);
static int _error_message_handler(const char * const from, static int _chat_message_handler(xmpp_stanza_t * const stanza);
xmpp_stanza_t * const stanza);
static int _chat_message_handler(const char * const from,
xmpp_stanza_t * const stanza);
static int _roster_handler(xmpp_conn_t * const conn, static int _roster_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata); xmpp_stanza_t * const stanza, void * const userdata);
@@ -380,9 +377,10 @@ _jabber_roster_request(void)
} }
static int static int
_groupchat_message_handler(const char * const room_jid, _groupchat_message_handler(xmpp_stanza_t * const stanza)
xmpp_stanza_t * const stanza)
{ {
gchar *room_jid = xmpp_stanza_get_attribute(stanza, "from");
if (room_is_active(room_jid)) { if (room_is_active(room_jid)) {
xmpp_stanza_t *delay = xmpp_stanza_get_child_by_name(stanza, "delay"); xmpp_stanza_t *delay = xmpp_stanza_get_child_by_name(stanza, "delay");
@@ -438,7 +436,7 @@ _groupchat_message_handler(const char * const room_jid,
} }
static int static int
_error_message_handler(const char * const from, xmpp_stanza_t * const stanza) _error_message_handler(xmpp_stanza_t * const stanza)
{ {
char *err_msg = NULL; char *err_msg = NULL;
xmpp_stanza_t *error = xmpp_stanza_get_child_by_name(stanza, "error"); xmpp_stanza_t *error = xmpp_stanza_get_child_by_name(stanza, "error");
@@ -459,14 +457,16 @@ _error_message_handler(const char * const from, xmpp_stanza_t * const stanza)
// TODO: process 'type' attribute from <error/> [RFC6120, 8.3.2] // TODO: process 'type' attribute from <error/> [RFC6120, 8.3.2]
} }
gchar *from = xmpp_stanza_get_attribute(stanza, "from");
prof_handle_error_message(from, err_msg); prof_handle_error_message(from, err_msg);
return 1; return 1;
} }
static int static int
_chat_message_handler(const char * const from, xmpp_stanza_t * const stanza) _chat_message_handler(xmpp_stanza_t * const stanza)
{ {
gchar *from = xmpp_stanza_get_attribute(stanza, "from");
char from_cpy[strlen(from) + 1]; char from_cpy[strlen(from) + 1];
strcpy(from_cpy, from); strcpy(from_cpy, from);
char *short_from = strtok(from_cpy, "/"); char *short_from = strtok(from_cpy, "/");
@@ -531,17 +531,16 @@ _message_handler(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata) xmpp_stanza_t * const stanza, void * const userdata)
{ {
gchar *type = xmpp_stanza_get_attribute(stanza, "type"); gchar *type = xmpp_stanza_get_attribute(stanza, "type");
gchar *from = xmpp_stanza_get_attribute(stanza, "from");
if (type == NULL) { if (type == NULL) {
log_error("Message stanza received with no type attribute"); log_error("Message stanza received with no type attribute");
return 1; return 1;
} else if (strcmp(type, "error") == 0) { } else if (strcmp(type, "error") == 0) {
return _error_message_handler(from, stanza); return _error_message_handler(stanza);
} else if (strcmp(type, "groupchat") == 0) { } else if (strcmp(type, "groupchat") == 0) {
return _groupchat_message_handler(from, stanza); return _groupchat_message_handler(stanza);
} else if (strcmp(type, "chat") == 0) { } else if (strcmp(type, "chat") == 0) {
return _chat_message_handler(from, stanza); return _chat_message_handler(stanza);
} else { } else {
log_error("Message stanza received with unknown type: %s", type); log_error("Message stanza received with unknown type: %s", type);
return 1; return 1;