newsearch changes to support addition of trust_search/patriciasearch

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

diff --git a/newsearch/ns-oppct.c b/newsearch/ns-oppct.c
index 373e0a9f8647b435dcb098c64b366471648f70be..0f835a85a16bfa3aaf7fb17343ff05af21a4baa7 100644 (file)
--- a/newsearch/ns-oppct.c
+++ b/newsearch/ns-oppct.c
@@ -7,17 +7,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-void *oppct_exe(struct searchNode *thenode, void *theinput);
-void oppct_free(struct searchNode *thenode);
+void *oppct_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void oppct_free(searchCtx *ctx, struct searchNode *thenode);
 
-struct searchNode *oppct_parse(int type, int argc, char **argv) {
+struct searchNode *oppct_parse(searchCtx *ctx, int argc, char **argv) {
   struct searchNode *thenode;
 
-  if (type != SEARCHTYPE_CHANNEL) {
-    parseError = "oppct: this function is only valid for channel searches.";
-    return NULL;
-  }
-
   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.";
@@ -32,7 +27,7 @@ struct searchNode *oppct_parse(int type, int argc, char **argv) {
   return thenode;
 }
 
-void *oppct_exe(struct searchNode *thenode, void *theinput) {
+void *oppct_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   int i;
   int ops;
   chanindex *cip = (chanindex *)theinput;
@@ -53,7 +48,7 @@ void *oppct_exe(struct searchNode *thenode, void *theinput) {
   return (void *)(long)((ops * 100) / cip->channel->users->totalusers);
 }
 
-void oppct_free(struct searchNode *thenode) {
+void oppct_free(searchCtx *ctx, struct searchNode *thenode) {
   free(thenode);
 }