CHANSERV: authtracker now keeps 240 days history

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

diff --git a/newsearch/ns-name.c b/newsearch/ns-name.c
index 09e87b45b38691bf8b17d16bc4153a202727c8b5..2b5abc49af0aafcc363565828ef2b39ae6b0c00f 100644 (file)
--- a/newsearch/ns-name.c
+++ b/newsearch/ns-name.c
@@ -7,62 +7,33 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-struct name_localdata {
-  const char *pattern;
-};
+void *name_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void name_free(searchCtx *ctx, struct searchNode *thenode);
 
-void *name_exe(struct searchNode *thenode, int type, void *theinput);
-void name_free(struct searchNode *thenode);
-
-struct searchNode *name_parse(int type, int argc, char **argv) {
-  struct name_localdata *localdata;
+struct searchNode *name_parse(searchCtx *ctx, int argc, char **argv) {
   struct searchNode *thenode;
 
-  if (type != SEARCHTYPE_CHANNEL) {
-    parseError = "name: this function is only valid for channel searches.";
-    return NULL;
-  }
-
-  if (argc!=1) {
-    parseError="name: usage: (name target)";
-    return NULL;
-  }
-
-  if (!(localdata=(struct name_localdata *)malloc(sizeof(struct name_localdata)))) {
-    parseError = "malloc: could not allocate memory for this search.";
-    return NULL;
-  }
-
-  localdata->pattern = argv[0];
-
   if (!(thenode=(struct searchNode *)malloc(sizeof(struct searchNode)))) {
     /* couldn't malloc() memory for thenode, so free localdata to avoid leakage */
     parseError = "malloc: could not allocate memory for this search.";
-    free(localdata);
     return NULL;
   }
 
-  thenode->returntype = RETURNTYPE_BOOL;
-  thenode->localdata = localdata;
+  thenode->returntype = RETURNTYPE_STRING;
+  thenode->localdata = NULL;
   thenode->exe = name_exe;
   thenode->free = name_free;
 
   return thenode;
 }
 
-void *name_exe(struct searchNode *thenode, int type, void *theinput) {
+void *name_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   chanindex *cip = (chanindex *)theinput;
-  struct name_localdata *localdata;
 
-  localdata = thenode->localdata;
-  
-  if ((cip->channel==NULL) || !match2strings(localdata->pattern, cip->name->content))
-    return falseval(type);
-  return trueval(type);
+  return cip->name->content;
 }
 
-void name_free(struct searchNode *thenode) {
-  free(thenode->localdata);
+void name_free(searchCtx *ctx, struct searchNode *thenode) {
   free(thenode);
 }