[srvx-commits] CVS: services/src hash.c,1.140,1.141 tools.c,1.88,1.89 tools.h,1.8,1.9

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

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv642/src

Modified Files:
	hash.c tools.c tools.h 
Log Message:
make key parameter to mod_chanmode a "const char *"


Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** hash.c	2001/08/11 02:33:31	1.140
--- hash.c	2001/08/12 20:47:38	1.141
***************
*** 465,469 ****
  	}
  
! 	mod_chanmode(cNode, modes, (char *)key, limit);
  
  	if (new || cNode->timestamp > time_) {
--- 465,469 ----
  	}
  
! 	mod_chanmode(cNode, modes, key, limit);
  
  	if (new || cNode->timestamp > time_) {

Index: tools.c
===================================================================
RCS file: /cvsroot/srvx/services/src/tools.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** tools.c	2001/08/11 16:37:36	1.88
--- tools.c	2001/08/12 20:47:38	1.89
***************
*** 87,90 ****
--- 87,93 ----
  #define do_user_mode(FLAG) do { if (add) user->modes |= FLAG; else user->modes &= ~FLAG; } while (0)
  	switch (*mode_change++) {
+         /* TODO: update this to include the new Bahamut channel modes,
+          * but to only support them #if (PROTOCOL_CHANMODE_BITS & MODE_foo)
+          */
  	case 0: return;
  	case '+': add = 1; break;
***************
*** 120,124 ****
  }
  
! void mod_chanmode(struct chanNode *channel, const char *mode_change, char *key, int limit)
  {
      int add = 1, n;
--- 123,127 ----
  }
  
! void mod_chanmode(struct chanNode *channel, const char *mode_change, const char *key, int limit)
  {
      int add = 1, n;
***************
*** 148,152 ****
  	case 'k':
  	    if (add) {
! 		if(key) {
  		    safestrncpy(channel->key, key, sizeof(channel->key));
  		} else {
--- 151,155 ----
  	case 'k':
  	    if (add) {
! 		if (key) {
  		    safestrncpy(channel->key, key, sizeof(channel->key));
  		} else {

Index: tools.h
===================================================================
RCS file: /cvsroot/srvx/services/src/tools.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tools.h	2001/08/01 22:14:35	1.8
--- tools.h	2001/08/12 20:47:38	1.9
***************
*** 39,43 ****
  int getusermodes(char *sender);
  void mod_usermode(struct userNode *user, const char *modes);
! void mod_chanmode(struct chanNode *channel, const char *mode_change, char *key, int limit);
  int verify_chanmode(const char *modes);
  int split_line(unsigned char *line, int irc_colon, int argv_size, unsigned char *argv[]);
--- 39,43 ----
  int getusermodes(char *sender);
  void mod_usermode(struct userNode *user, const char *modes);
! void mod_chanmode(struct chanNode *channel, const char *mode_change, const char *key, int limit);
  int verify_chanmode(const char *modes);
  int split_line(unsigned char *line, int irc_colon, int argv_size, unsigned char *argv[]);