[srvx-commits] CVS: services/src proto-p10.c,1.82,1.83

[Entrope <en...@us...>]

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

Modified Files:
	proto-p10.c 
Log Message:
eliminate warning when handling JOIN 0


Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** proto-p10.c	2 Dec 2003 19:50:22 -0000	1.82
--- proto-p10.c	9 Dec 2003 16:09:43 -0000	1.83
***************
*** 881,897 ****
       * bad-word channel checking.
       */
!     struct chanNode *cn = AddChannel(name, cd->when, NULL, NULL);
!     struct modeNode *mn = AddChannelUser(cd->user, cn);
!     if (mn && (cn->members.used == 1))
!         mn->modes = MODE_CHANOP;
! }
! 
! static void
! join_0_helper(char *name, void *data)
! {
!     struct create_desc *cd = data;
!     if (!strcmp(name, "0"))
          while (cd->user->channels.used > 0)
              DelChannelUser(cd->user, cd->user->channels.list[0]->channel, 0, 0);
  }
  
--- 881,895 ----
       * bad-word channel checking.
       */
!     struct chanNode *cn;
!     struct modeNode *mn;
!     if (!strcmp(name, "0")) {
          while (cd->user->channels.used > 0)
              DelChannelUser(cd->user, cd->user->channels.list[0]->channel, 0, 0);
+         return;
+     }
+     cn = AddChannel(name, cd->when, NULL, NULL);
+     mn = AddChannelUser(cd->user, cn);
+     if (mn && (cn->members.used == 1))
+         mn->modes = MODE_CHANOP;
  }
  
***************
*** 921,925 ****
      else
          cd.when = atoi(argv[2]);
!     parse_foreach(argv[1], join_helper, create_helper, NULL, join_0_helper, &cd);
      return 1;
  }
--- 919,923 ----
      else
          cd.when = atoi(argv[2]);
!     parse_foreach(argv[1], join_helper, create_helper, NULL, NULL, &cd);
      return 1;
  }
***************
*** 1576,1580 ****
          old = *j;
          *j = 0;
!         if (IsChannelName(target_list)) {
              struct chanNode *chan = GetChannel(target_list);
              if (chan) {
--- 1574,1579 ----
          old = *j;
          *j = 0;
!         if (IsChannelName(target_list)
!             || (target_list[0] == '0' && target_list[1] == '\0')) {
              struct chanNode *chan = GetChannel(target_list);
              if (chan) {