!x&y == (!x)&y, not !(x&y).

4 files changed, 9 insertions, 9 deletions

diff --git a/ipc.c b/ipc.c
index 5a23d1f9..d7ef1020 100644
--- a/ipc.c
+++ b/ipc.c
@@ -114,7 +114,7 @@ static void ipc_child_cmd_die( irc_t *irc, char **cmd )
 
 static void ipc_child_cmd_wallops( irc_t *irc, char **cmd )
 {
-	if( ! irc->status & USTATUS_LOGGED_IN )
+	if( !( irc->status & USTATUS_LOGGED_IN ) )
 		return;
 	
 	if( strchr( irc->umode, 'w' ) )
@@ -123,7 +123,7 @@ static void ipc_child_cmd_wallops( irc_t *irc, char **cmd )
 
 static void ipc_child_cmd_lilo( irc_t *irc, char **cmd )
 {
-	if( ! irc->status & USTATUS_LOGGED_IN )
+	if( !( irc->status & USTATUS_LOGGED_IN ) )
 		return;
 	
 	if( strchr( irc->umode, 's' ) )
@@ -132,7 +132,7 @@ static void ipc_child_cmd_lilo( irc_t *irc, char **cmd )
 
 static void ipc_child_cmd_opermsg( irc_t *irc, char **cmd )
 {
-	if( ! irc->status & USTATUS_LOGGED_IN )
+	if( !( irc->status & USTATUS_LOGGED_IN ) )
 		return;
 	
 	if( strchr( irc->umode, 'o' ) )
@@ -153,7 +153,7 @@ static void ipc_child_cmd_rehash( irc_t *irc, char **cmd )
 
 static void ipc_child_cmd_kill( irc_t *irc, char **cmd )
 {
-	if( ! irc->status & USTATUS_LOGGED_IN )
+	if( !( irc->status & USTATUS_LOGGED_IN ) )
 		return;
 	
 	if( nick_cmp( cmd[1], irc->nick ) != 0 )
@@ -165,7 +165,7 @@ static void ipc_child_cmd_kill( irc_t *irc, char **cmd )
 
 static void ipc_child_cmd_hello( irc_t *irc, char **cmd )
 {
-	if( ! irc->status & USTATUS_LOGGED_IN )
+	if( !( irc->status & USTATUS_LOGGED_IN ) )
 		ipc_to_master_str( "HELLO\r\n" );
 	else
 		ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
diff --git a/irc.c b/irc.c
index cd30d1c2..62af4b08 100644
--- a/irc.c
+++ b/irc.c
@@ -700,7 +700,7 @@ int irc_check_login( irc_t *irc )
 {
 	if( irc->user && irc->nick )
 	{
-		if( global.conf->authmode == AUTHMODE_CLOSED && ! irc->status & USTATUS_AUTHORIZED )
+		if( global.conf->authmode == AUTHMODE_CLOSED && !( irc->status & USTATUS_AUTHORIZED ) )
 		{
 			irc_reply( irc, 464, ":This server is password-protected." );
 			return 0;
@@ -1180,7 +1180,7 @@ static gboolean irc_userping( gpointer _irc )
 	irc_t *irc = _irc;
 	int rv = 0;
 	
-	if( ! irc->status & USTATUS_LOGGED_IN )
+	if( !( irc->status & USTATUS_LOGGED_IN ) )
 	{
 		if( gettime() > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )
 			rv = gettime() - irc->last_pong;
diff --git a/irc_commands.c b/irc_commands.c
index 519070db..f410bb52 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -613,7 +613,7 @@ void irc_exec( irc_t *irc, char *cmd[] )
 			{
 				irc_reply( irc, 462, ":Only allowed before logging in" );
 			}
-			else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && ! irc->status & USTATUS_LOGGED_IN )
+			else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && !( irc->status & USTATUS_LOGGED_IN ) )
 			{
 				irc_reply( irc, 451, ":Register first" );
 			}
diff --git a/root_commands.c b/root_commands.c
index d8611347..3d3584b3 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -200,7 +200,7 @@ static void cmd_account( irc_t *irc, char **cmd )
 {
 	account_t *a;
 	
-	if( global.conf->authmode == AUTHMODE_REGISTERED && ! irc->status & USTATUS_IDENTIFIED )
+	if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
 	{
 		irc_usermsg( irc, "This server only accepts registered users" );
 		return;