SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reduce abuse of ternary operator 

The ?: operator should not be used as a generic shorthand for if/else.
(Which isn't needed here either...)
This commit is contained in:
Mantas Mikulėnas 2013-04-23 01:09:58 -04:00 committed by TingPing
parent 2550a94f05
commit 5318c953ed
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/proto-irc.c
View File

@ -1234,36 +1234,37 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[])
want_cap = 0; want_cap = 0;
want_sasl = 0; want_sasl = 0;
strcpy (buffer, "CAP REQ :");
if (strstr (word_eol[5], "identify-msg") != 0) if (strstr (word_eol[5], "identify-msg") != 0)
{ {
strcpy (buffer, "CAP REQ :identify-msg"); strcat (buffer, "identify-msg ");
want_cap = 1; want_cap = 1;
} }
if (strstr (word_eol[5], "multi-prefix") != 0) if (strstr (word_eol[5], "multi-prefix") != 0)
{ {
want_cap ? strcat (buffer, " multi-prefix") : strcpy (buffer, "CAP REQ :multi-prefix"); strcat (buffer, "multi-prefix ");
want_cap = 1; want_cap = 1;
} }
if (strstr (word_eol[5], "away-notify") != 0) if (strstr (word_eol[5], "away-notify") != 0)
{ {
want_cap ? strcat (buffer, " away-notify") : strcpy (buffer, "CAP REQ :away-notify"); strcat (buffer, "away-notify ");
want_cap = 1; want_cap = 1;
} }
if (strstr (word_eol[5], "account-notify") != 0) if (strstr (word_eol[5], "account-notify") != 0)
{ {
want_cap ? strcat (buffer, " account-notify") : strcpy (buffer, "CAP REQ :account-notify"); strcat (buffer, "account-notify ");
want_cap = 1; want_cap = 1;
} }
if (strstr (word_eol[5], "extended-join") != 0) if (strstr (word_eol[5], "extended-join") != 0)
{ {
want_cap ? strcat (buffer, " extended-join") : strcpy (buffer, "CAP REQ :extended-join"); strcat (buffer, "extended-join ");
want_cap = 1; want_cap = 1;
} }
/* if the SASL password is set, request SASL auth */ /* if the SASL password is set, request SASL auth */
if (strstr (word_eol[5], "sasl") != 0 && strlen (sess->server->saslpassword) != 0) if (strstr (word_eol[5], "sasl") != 0 && strlen (sess->server->saslpassword) != 0)
{ {
want_cap ? strcat (buffer, " sasl") : strcpy (buffer, "CAP REQ :sasl"); strcat (buffer, "sasl ");
want_cap = 1; want_cap = 1;
want_sasl = 1; want_sasl = 1;
} }