CHANSERV: better batcher error handling for expired accounts/accounts with no email.

[irc/quakenet/newserv.git] / newsearch / ns-channeliter.c

diff --git a/newsearch/ns-channeliter.c b/newsearch/ns-channeliter.c
index d05fa3770e4f4d604715f181c54bc39a6daa240d..5185f55ed888daa7e1c1608f850c93cb14004c06 100644 (file)
--- a/newsearch/ns-channeliter.c
+++ b/newsearch/ns-channeliter.c
@@ -18,7 +18,7 @@ struct channeliter_localdata {
   nick *lastnick;
 };
 
-struct searchNode *channeliter_parse(searchCtx *ctx, int type, int argc, char **argv) {
+struct searchNode *channeliter_parse(searchCtx *ctx, int argc, char **argv) {
   searchNode *thenode;
   struct channeliter_localdata *localdata;
   
@@ -27,17 +27,13 @@ struct searchNode *channeliter_parse(searchCtx *ctx, int type, int argc, char **
     return NULL;
   }
 
-  if(type != SEARCHTYPE_NICK) {
-    parseError = "channeliter: this function is only valid for nick searches.";
-    return NULL;
-  }
-
   if(!(localdata=(struct channeliter_localdata *)malloc(sizeof(struct channeliter_localdata)))) {
     parseError = "malloc: could not allocate memory for this search.";
     return NULL;
   }
 
-  if(!(localdata->variable=var_register(ctx, type, argv[0], RETURNTYPE_STRING))) {
+  /* @argv usage OK */
+  if(!(localdata->variable=var_register(ctx, argv[0], RETURNTYPE_STRING))) {
     free(localdata);
     return NULL;
   }
@@ -73,9 +69,10 @@ void *channeliter_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput
     localdata->currentchannel = 0;
   }
   
-  if(np->channels->cursi > MAX_CHANS)
+/*  if(np->channels->cursi > MAX_CHANS)
     return (void *)0;
-  
+*/
+
   if(localdata->currentchannel >= np->channels->cursi)
     return (void *)0;