[srvx-commits] CVS: services/src chanserv.c,1.337,1.338

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16265/src

Modified Files:
	chanserv.c 
Log Message:
Make some minor fixes to the channel suspension code


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -C2 -r1.337 -r1.338
*** chanserv.c	31 Jan 2003 21:56:23 -0000	1.337
--- chanserv.c	31 Jan 2003 22:07:14 -0000	1.338
***************
*** 1401,1404 ****
--- 1401,1412 ----
  	struct suspended *suspended, *next_suspended;
  
+         /* Remove the channel from sChannels if the channel is
+            currently suspended (channel->suspended may be non-
+            NULL if the channel has a suspension history). */
+         if(IsSuspended(channel))
+         {
+             dict_remove(sChannels, channel->suspended->name);
+         }
+ 
          for(suspended = channel->suspended; suspended; suspended = next_suspended)
          {
***************
*** 1893,1905 ****
      name = strdup(channel->name);
      cData = channel->channel_info;
!     if(IsSuspended(cData))
!     {
!         dict_remove(sChannels, channel->name);
!         unregister_channel(cData);
!     }
!     else
      {
          sprintf(reason, "Channel unregistered by %s.", user->handle_info->handle);
-         unregister_channel(cData);
  	DelChannelUser(chanserv, channel, reason, 0);
      }
--- 1901,1908 ----
      name = strdup(channel->name);
      cData = channel->channel_info;
!     unregister_channel(cData);
!     if(!IsSuspended(cData))
      {
          sprintf(reason, "Channel unregistered by %s.", user->handle_info->handle);
  	DelChannelUser(chanserv, channel, reason, 0);
      }
***************
*** 4809,4813 ****
      suspended->previous = suspended->cData->suspended;
      suspended->cData->suspended = suspended;
-     suspended->cData->channel = NULL;
  
      /* Mark the channel as suspended, then part. */
--- 4812,4815 ----