albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Client_HasMode and Client_HasFlag where appropriate

This commit is contained in:
Federico G. Schwindt 2013-08-04 17:25:24 +01:00
parent 139f5961a0
commit 672a167963
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ngircd/client.c
View File

@ -217,7 +217,7 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
if (Type == CLIENT_SERVER) if (Type == CLIENT_SERVER)
Generate_MyToken(client); Generate_MyToken(client);
if (strchr(client->modes, 'a')) if (Client_HasMode(client, 'a'))
strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away));
client->next = (POINTER *)My_Clients; client->next = (POINTER *)My_Clients;
@ -524,7 +524,7 @@ Client_ModeAdd( CLIENT *Client, char Mode )
assert( Client != NULL ); assert( Client != NULL );
x[0] = Mode; x[1] = '\0'; x[0] = Mode; x[1] = '\0';
if (!strchr( Client->modes, x[0])) { if (!Client_HasMode(Client, x[0])) {
strlcat( Client->modes, x, sizeof( Client->modes )); strlcat( Client->modes, x, sizeof( Client->modes ));
return true; return true;
} }
@ -1131,7 +1131,8 @@ Client_OperCount( void )
c = My_Clients; c = My_Clients;
while( c ) while( c )
{ {
if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++; if (c && c->type == CLIENT_USER && Client_HasMode(c, 'o' ))
cnt++;
c = (CLIENT *)c->next; c = (CLIENT *)c->next;
} }
return cnt; return cnt;
@ -1580,7 +1581,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User)
} else { } else {
/* RFC 2813 mode: one combined NICK or SERVICE command */ /* RFC 2813 mode: one combined NICK or SERVICE command */
if (Client_Type(User) == CLIENT_SERVICE if (Client_Type(User) == CLIENT_SERVICE
&& strchr(Client_Flags(Client), 'S')) { && Client_HasFlag(Client, 'S')) {
if (!IRC_WriteStrClientPrefix(Client, Prefix, if (!IRC_WriteStrClientPrefix(Client, Prefix,
"SERVICE %s %d * +%s %d :%s", "SERVICE %s %d * +%s %d :%s",
Client_Mask(User), Client_Mask(User),
@ -1599,7 +1600,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User)
} }
} }
if (strchr(Client_Flags(Client), 'M')) { if (Client_HasFlag(Client, 'M')) {
/* Synchronize metadata */ /* Synchronize metadata */
if (Client_HostnameCloaked(User)) { if (Client_HostnameCloaked(User)) {
if (!IRC_WriteStrClientPrefix(Client, Prefix, if (!IRC_WriteStrClientPrefix(Client, Prefix,