move some more data/log paths missed before

[irc/quakenet/newserv.git] / patriciasearch / patriciasearch.c

diff --git a/patriciasearch/patriciasearch.c b/patriciasearch/patriciasearch.c
index e4d3c3ee8f41d84015fc36604c94df22cc50685b..d1b2e64c0deb17bab6ed6d550ba9e75b15c52f27 100644 (file)
--- a/patriciasearch/patriciasearch.c
+++ b/patriciasearch/patriciasearch.c
@@ -12,24 +12,13 @@
 #include "../lib/strlfunc.h"
 #include "patriciasearch.h"
 
-CommandTree *pnodeOutputTree;
 searchCmd *reg_nodesearch;
 
 int do_pnodesearch(void *source, int cargc, char **cargv);
 
 NodeDisplayFunc defaultpnodefn = printnode;
 
-void regpnodedisp(const char *name, NodeDisplayFunc handler) {
-  addcommandtotree(pnodeOutputTree, name, 0, 0, (CommandHandler)handler);
-}
-
-void unregpnodedisp(const char *name, NodeDisplayFunc handler) {
-  deletecommandfromtree(pnodeOutputTree, name, (CommandHandler)handler);
-}
-
 void _init() {
-  pnodeOutputTree=newcommandtree();
-
   reg_nodesearch = (searchCmd *)registersearchcommand("nodesearch",NO_OPER,do_pnodesearch, printnode);
 
   registersearchterm(reg_nodesearch, "users", ps_users_parse, 0, "");
@@ -37,8 +26,6 @@ void _init() {
 }
 
 void _fini() {
-  destroycommandtree(pnodeOutputTree);
-
   deregistersearchcommand( reg_nodesearch );
 }
 
@@ -65,7 +52,7 @@ int do_pnodesearch_real(replyFunc reply, wallFunc wall, void *source, int cargc,
   if (cargc<1)
     return CMD_USAGE;
 
-  ret = parseopts(cargc, cargv, &arg, &limit, (void *)&subset, (void **)&display, reg_nodesearch->outputtree, reply, sender);
+  ret = parseopts(cargc, cargv, &arg, &limit, (void *)&subset, (void *)&display, reg_nodesearch->outputtree, reply, sender);
   if(ret != CMD_OK)
     return ret;
 
@@ -78,14 +65,14 @@ int do_pnodesearch_real(replyFunc reply, wallFunc wall, void *source, int cargc,
     rejoinline(cargv[arg],cargc-arg);
   }
 
-  newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_nodesearch, sender);
+  newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_nodesearch, sender, display, limit);
 
   if (!(search = ctx.parser(&ctx, cargv[arg]))) {
     reply(sender,"Parse error: %s",parseError);
     return CMD_ERROR;
   }
 
-  pnodesearch_exe(search, &ctx, sender, display, limit, subset);
+  pnodesearch_exe(search, &ctx, subset);
 
   (search->free)(&ctx, search);
 
@@ -96,9 +83,12 @@ int do_pnodesearch(void *source, int cargc, char **cargv) {
   return do_pnodesearch_real(controlreply, controlwallwrapper, source, cargc, cargv);
 }
 
-void pnodesearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, NodeDisplayFunc display, int limit, patricia_node_t *subset) {
+void pnodesearch_exe(struct searchNode *search, searchCtx *ctx, patricia_node_t *subset) {
   int matches = 0;
   patricia_node_t *node;
+  nick *sender = ctx->sender;
+  int limit = ctx->limit;
+  NodeDisplayFunc display = ctx->displayfn;
 
   /* Get a marker value to mark "seen" channels for unique count */
   //nmarker=nextnodemarker();