Changeset 5898ef8 for irc.c

Timestamp:

2006-06-15T12:46:31Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

10efa91

Parents:

c121f89 (diff), 79e826a (diff), 3af70b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

xml_save(), decent error handling and merging fixed autosaving.

File:

• irc.c (modified) (6 diffs)

irc.c

@@ -177 +177 @@
         }
         
-        irc->status = USTATUS_SHUTDOWN;
+        irc->status |= USTATUS_SHUTDOWN;
         if( irc->sendbuffer && !immed )
         {
@@ -211 +211 @@
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
                 if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
@@ -577 +577 @@
                 
         /* Don't try to write anything new anymore when shutting down. */
-        if( irc->status == USTATUS_SHUTDOWN )
+        if( irc->status & USTATUS_SHUTDOWN )
                 return;
         
@@ -707 +707 @@
         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." );
@@ -764 +764 @@
                 ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
         
-        irc->status = USTATUS_LOGGED_IN;
+        irc->status |= USTATUS_LOGGED_IN;
 }
 
@@ -1187 +1187 @@
         int rv = 0;
         
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
         {
                 if( gettime() > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )