devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Renamed params in jabber_join

Browse Source
This commit is contained in:
James Booth
2012-11-10 18:28:45 +00:00
parent 522102d4ea
commit aebca570a4
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/command.c
View File

@@ -997,7 +997,7 @@ _cmd_msg(const char * const inp, struct cmd_help_t help)
static gboolean
_cmd_join(const char * const inp, struct cmd_help_t help)
{
char *room_jid = NULL;
char *room = NULL;
char *nick = NULL;
jabber_conn_status_t conn_status = jabber_get_connection_status();
@@ -1011,12 +1011,12 @@ _cmd_join(const char * const inp, struct cmd_help_t help)
// get room jid
strtok(inp_cpy, " ");
room_jid = strtok(NULL, " ");
if (room_jid == NULL) {
room = strtok(NULL, " ");
if (room == NULL) {
cons_show("Usage: %s", help.usage);
} else {
if ((strlen(inp) > (6 + strlen(room_jid) + 1))) {
nick = strndup(inp+6+strlen(room_jid)+1, strlen(inp)-(6+strlen(room_jid)+1));
if ((strlen(inp) > (6 + strlen(room) + 1))) {
nick = strndup(inp+6+strlen(room)+1, strlen(inp)-(6+strlen(room)+1));
}
// if no nick, set to first part of jid
@@ -1026,8 +1026,8 @@ _cmd_join(const char * const inp, struct cmd_help_t help)
strcpy(jid_cpy, jid);
nick = strdup(strtok(jid_cpy, "@"));
}
jabber_join(room_jid, nick);
win_join_chat(room_jid, nick);
jabber_join(room, nick);
win_join_chat(room, nick);
}
}