BUILD : 1.7.4 (271) BUGS : NOTES : Rolled Back to 291 for GeniusDex

git-svn-id: svn://svn.anope.org/anope/trunk@271 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@175 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 0 insertions, 62 deletions

diff --git a/src/channels.c b/src/channels.c
index 2e83ca083..9fff738b4 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -33,9 +33,6 @@ static void del_exception(Channel * chan, char *mask);
 #ifdef HAS_FMODE
 static char *get_flood(Channel * chan);
 #endif
-#ifdef HAS_JOINFLOOD
-static char *get_joinflood(Channel * chan);
-#endif
 static char *get_key(Channel * chan);
 static char *get_limit(Channel * chan);
 #ifdef HAS_LMODE
@@ -45,9 +42,6 @@ static Channel *join_user_update(User * user, Channel * chan, char *name);
 #ifdef HAS_FMODE
 static void set_flood(Channel * chan, char *value);
 #endif
-#ifdef HAS_JOINFLOOD
-static void set_joinflood(Channel * chan, char *value);
-#endif
 static void set_key(Channel * chan, char *value);
 static void set_limit(Channel * chan, char *value);
 #ifdef HAS_LMODE
@@ -173,11 +167,7 @@ CBMode cbmodes[128] = {
 	{ 0 }, /* g */
 	{ 0 }, /* h */
 	{ CMODE_i, 0, NULL, NULL },
-#ifdef HAS_JOINFLOOD
-	{ CMODE_j, CBM_MINUS_NO_ARG, set_joinflood, cs_set_joinflood },
-#else
 	{ 0 }, /* j */
-#endif
 	{ CMODE_k, 0, set_key, cs_set_key },
 	{ CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit },
 	{ CMODE_m, 0, NULL, NULL },
@@ -231,9 +221,6 @@ CBModeInfo cbmodeinfos[] = {
 	{ 'f', CMODE_f, 0, get_flood, cs_get_flood },
 #endif
 	{ 'i', CMODE_i, 0, NULL, NULL },
-#ifdef HAS_JOINFLOOD
-	{ 'j', CMODE_j, CBM_MINUS_NO_ARG, get_joinflood, cs_get_joinflood },
-#endif
 	{ 'k', CMODE_k, 0, get_key, cs_get_key },
 	{ 'l', CMODE_l, CBM_MINUS_NO_ARG, get_limit, cs_get_limit },
 	{ 'm', CMODE_m, 0, NULL, NULL },
@@ -1504,13 +1491,6 @@ static char *get_flood(Channel * chan)
 
 /*************************************************************************/
 
-static char *get_joinflood(Channel * chan)
-{
-    return chan->joinflood;
-}
-
-/*************************************************************************/
-
 static char *get_key(Channel * chan)
 {
     return chan->key;
@@ -1584,19 +1564,6 @@ static void set_flood(Channel * chan, char *value)
 
 /*************************************************************************/
 
-static void set_joinflood(Channel * chan, char *value)
-{
-    if (chan->joinflood)
-        free(chan->joinflood);
-    chan->joinflood = value ? sstrdup(value) : NULL;
-
-    if (debug)
-        alog("debug: Joinflood setting of channel %s set to %s", chan->name,
-             chan->joinflood ? chan->joinflood : "no joinflood settings");
-}
-
-/*************************************************************************/
-
 static void set_key(Channel * chan, char *value)
 {
     if (chan->key)
diff --git a/src/chanserv.c b/src/chanserv.c
index dc6015676..06236c547 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2403,13 +2403,6 @@ char *cs_get_flood(ChannelInfo * ci)
 
 /*************************************************************************/
 
-char *cs_get_joinflood(ChannelInfo * ci)
-{
-    return ci->mlock_joinflood;
-}
-
-/*************************************************************************/
-
 char *cs_get_key(ChannelInfo * ci)
 {
     return ci->mlock_key;
@@ -2466,28 +2459,6 @@ void cs_set_flood(ChannelInfo * ci, char *value)
 
 /*************************************************************************/
 
-#ifdef HAS_JOINFLOOD
-void cs_set_joinflood(ChannelInfo * ci, char *value)
-{
-    char *end;
-    
-    if (ci->mlock_joinflood)
-        free(ci->mlock_joinflood);
-
-    if ((*value != ':') && (strtoul(value, &end, 10) > 0) && (*end == ':')
-	&& (*(++end) != '\0') && (strtoul(end, &end, 10) > 0)
-	&& (*end == '\0')) {
-	/* Above if looks ugly, but should work (tm) */
-        ci->mlock_joinflood = sstrdup(value);
-    } else {
-        ci->mlock_on &= ~CMODE_j;
-        ci->mlock_joinflood = NULL;
-    }
-}
-#endif
-
-/*************************************************************************/
-
 void cs_set_key(ChannelInfo * ci, char *value)
 {
     if (ci->mlock_key)