[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sun Oct 14 06:09:02 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-14 11:08:21 UTC
Commited by: Tothwolf <tothwolf at techmonkeys.org>

Modified files:
     src/chanprog.c src/mod/channels.mod/userchan.c
     src/mod/irc.mod/mode.c

Log message:

* bugfixes where splitnick() was removed

---------------------- diff included ----------------------
Index: eggdrop1.7/src/chanprog.c
diff -u eggdrop1.7/src/chanprog.c:1.31 eggdrop1.7/src/chanprog.c:1.32
--- eggdrop1.7/src/chanprog.c:1.31	Sat Oct 13 10:55:33 2001
+++ eggdrop1.7/src/chanprog.c	Sun Oct 14 06:08:10 2001
@@ -5,7 +5,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.31 2001/10/13 15:55:33 tothwolf Exp $
+ * $Id: chanprog.c,v 1.32 2001/10/14 11:08:10 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -195,8 +195,8 @@
   register struct chanset_t	*chan;
 
   strncpyz(buf, host, sizeof buf);
-  uhost = strtok(buf, "!");
-  nick = strtok(NULL, "!");
+  nick = strtok(buf, "!");
+  uhost = strtok(NULL, "!");
   for (chan = chanset; chan; chan = chan->next)
     for (m = chan->channel.member; m && m->nick[0]; m = m->next)
       if (!irccmp(nick, m->nick) && !egg_strcasecmp(uhost, m->userhost))
Index: eggdrop1.7/src/mod/channels.mod/userchan.c
diff -u eggdrop1.7/src/mod/channels.mod/userchan.c:1.29 eggdrop1.7/src/mod/channels.mod/userchan.c:1.30
--- eggdrop1.7/src/mod/channels.mod/userchan.c:1.29	Sat Oct 13 10:55:33 2001
+++ eggdrop1.7/src/mod/channels.mod/userchan.c	Sun Oct 14 06:08:10 2001
@@ -1,7 +1,7 @@
 /*
  * userchan.c -- part of channels.mod
  *
- * $Id: userchan.c,v 1.29 2001/10/13 15:55:33 tothwolf Exp $
+ * $Id: userchan.c,v 1.30 2001/10/14 11:08:10 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -788,7 +788,7 @@
 	strncpyz(buf, b->who, sizeof buf);
 	nick = strtok(buf, "!");
 	uhost = strtok(NULL, "!");
-	if (nick[0])
+	if (nick)
 	  sprintf(fill, "%s (%s!%s)", b->mask, nick, uhost);
 	else
 	  sprintf(fill, "%s (server %s)", b->mask, uhost);
@@ -878,7 +878,7 @@
 	strncpyz(buf, e->who, sizeof buf);
 	nick = strtok(buf, "!");
 	uhost = strtok(NULL, "!");
-	if (nick[0])
+	if (nick)
 	  sprintf(fill, "%s (%s!%s)", e->mask, nick, uhost);
 	else
 	  sprintf(fill, "%s (server %s)", e->mask, uhost);
@@ -968,7 +968,7 @@
 	strncpyz(buf, i->who, sizeof buf);
 	nick = strtok(buf, "!");
 	uhost = strtok(NULL, "!");
-	if (nick[0])
+	if (nick)
 	  sprintf(fill, "%s (%s!%s)", i->mask, nick, uhost);
 	else
 	  sprintf(fill, "%s (server %s)", i->mask, uhost);
@@ -1215,7 +1215,7 @@
   nick = strtok(buf, "!");
   uhost = strtok(NULL, "!");
 
-  if (!nick[0])
+  if (!nick)
     return 1;
 
   m = ismember(chan, nick);
Index: eggdrop1.7/src/mod/irc.mod/mode.c
diff -u eggdrop1.7/src/mod/irc.mod/mode.c:1.54 eggdrop1.7/src/mod/irc.mod/mode.c:1.55
--- eggdrop1.7/src/mod/irc.mod/mode.c:1.54	Sat Oct 13 10:55:33 2001
+++ eggdrop1.7/src/mod/irc.mod/mode.c	Sun Oct 14 06:08:10 2001
@@ -4,7 +4,7 @@
  *   channel mode changes and the bot's reaction to them
  *   setting and getting the current wanted channel modes
  *
- * $Id: mode.c,v 1.54 2001/10/13 15:55:33 tothwolf Exp $
+ * $Id: mode.c,v 1.55 2001/10/14 11:08:10 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -920,56 +920,56 @@
 	  break;
 	case 'i':
 	  todo = CHANINV;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'p':
 	  todo = CHANPRIV;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 's':
 	  todo = CHANSEC;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'm':
 	  todo = CHANMODER;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'c':
 	  todo = CHANNOCLR;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'R':
 	  todo = CHANREGON;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 't':
 	  todo = CHANTOPIC;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'n':
 	  todo = CHANNOMSG;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'a':
 	  todo = CHANANON;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'q':
 	  todo = CHANQUIET;
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  break;
 	case 'l':
-	  if ((!nick[0]) && (bounce_modes))
+	  if (!nick && bounce_modes)
 	    reversing = 1;
 	  if (ms2[0] == '-') {
 	    check_tcl_mode(nick, uhost, u, chan->dname, ms2, "");
@@ -1133,7 +1133,7 @@
 	}
 	chg++;
       }
-      if (!me_op(chan) && !nick[0])
+      if (!me_op(chan) && !nick)
         chan->status |= CHAN_ASKEDMODES;
     }
   }
----------------------- End of diff -----------------------



More information about the Changes mailing list