[srvx-commits] CVS: services/src chanserv.c,1.388,1.389

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

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

Modified Files:
	chanserv.c 
Log Message:
fix off-by-one error at end of user list in zoot_list


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.388
retrieving revision 1.389
diff -C2 -r1.388 -r1.389
*** chanserv.c	20 Oct 2003 17:17:40 -0000	1.388
--- chanserv.c	26 Oct 2003 19:22:49 -0000	1.389
***************
*** 3539,3543 ****
  zoot_list(struct listData *list)
  {
-     enum userLevel lvl = list->highest;
      struct userData *uData;
      unsigned int start, curr;
--- 3539,3542 ----
***************
*** 3556,3569 ****
      tmp_table.flags = list->table.flags;
      list->table.contents[0][0] = " ";
!     for(start = curr = 1; curr < list->table.length; ++curr)
      {
          uData = list->users[curr-1];
!         list->table.contents[curr][0] = " ";
!         if((start != curr) && ((uData->access != lvl) || (curr+1 == list->table.length)))
          {
              if(list->search)
!                 chanserv_notice(list->user, CSMSG_ACCESS_SEARCH_HDR, list->channel->name, accessNames[lvl], list->search);
              else
!                 chanserv_notice(list->user, CSMSG_ACCESS_HEADER, list->channel->name, accessNames[lvl]);
              temp = list->table.contents[--start];
              list->table.contents[start] = list->table.contents[0];
--- 3555,3568 ----
      tmp_table.flags = list->table.flags;
      list->table.contents[0][0] = " ";
!     for(start = curr = 1; curr < list->table.length; )
      {
          uData = list->users[curr-1];
!         list->table.contents[curr++][0] = " ";
!         if((curr == list->table.length) || (list->users[curr-1]->access != uData->access))
          {
              if(list->search)
!                 chanserv_notice(list->user, CSMSG_ACCESS_SEARCH_HDR, list->channel->name, accessNames[uData->access], list->search);
              else
!                 chanserv_notice(list->user, CSMSG_ACCESS_HEADER, list->channel->name, accessNames[uData->access]);
              temp = list->table.contents[--start];
              list->table.contents[start] = list->table.contents[0];
***************
*** 3573,3577 ****
              list->table.contents[start] = temp;
              start = curr;
-             lvl = uData->access;
          }
      }
--- 3572,3575 ----