commit - 139f5961a078dfd23a469d98c3942f42595854aa
commit + 672a1679639d597cf1c4336687ac78dcc24a9559
blob - 09bd6fdeaee8400ae3e5c75ee539fb230a607a09
blob + a6ada37d7635376c1bdb7296125dfdca55775b0f
--- src/ngircd/client.c
+++ src/ngircd/client.c
@@ -217,7 +217,7 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIEN
 	if (Type == CLIENT_SERVER)
 		Generate_MyToken(client);
 
-	if (strchr(client->modes, 'a'))
+	if (Client_HasMode(client, 'a'))
 		strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away));
 
 	client->next = (POINTER *)My_Clients;
@@ -524,7 +524,7 @@ Client_ModeAdd( CLIENT *Client, char Mode )
 	assert( Client != NULL );
 
 	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 ));
 		return true;
 	}
@@ -1131,7 +1131,8 @@ Client_OperCount( void )
 	c = My_Clients;
 	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;
 	}
 	return cnt;
@@ -1580,7 +1581,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIE
 	} else {
 		/* RFC 2813 mode: one combined NICK or SERVICE command */
 		if (Client_Type(User) == CLIENT_SERVICE
-		    && strchr(Client_Flags(Client), 'S')) {
+		    && Client_HasFlag(Client, 'S')) {
 			if (!IRC_WriteStrClientPrefix(Client, Prefix,
 					"SERVICE %s %d * +%s %d :%s",
 					Client_Mask(User),
@@ -1599,7 +1600,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIE
 		}
 	}
 
-	if (strchr(Client_Flags(Client), 'M')) {
+	if (Client_HasFlag(Client, 'M')) {
 		/* Synchronize metadata */
 		if (Client_HostnameCloaked(User)) {
 			if (!IRC_WriteStrClientPrefix(Client, Prefix,