TRUSTS: require sqlite

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

diff --git a/newsearch/ns-oppct.c b/newsearch/ns-oppct.c
index ff621f08ca9b64054efb2e9530faa20c07bea10e..7533b8b7f1da6eccf69b5a49d418e456e3f68276 100644 (file)
--- a/newsearch/ns-oppct.c
+++ b/newsearch/ns-oppct.c
@@ -7,77 +7,49 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-struct oppct_localdata {
-  long pct;
-};
+void *oppct_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void oppct_free(searchCtx *ctx, struct searchNode *thenode);
 
-void *oppct_exe(struct searchNode *thenode, int type, void *theinput);
-void oppct_free(struct searchNode *thenode);
-
-struct searchNode *oppct_parse(int type, int argc, char **argv) {
-  struct oppct_localdata *localdata;
+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 (argc!=1) {
-    parseError="oppct: usage: (oppct number)";
-    return NULL;
-  }
-
-  if (!(localdata=(struct oppct_localdata *)malloc(sizeof(struct oppct_localdata)))) {
-    parseError = "malloc: could not allocate memory for this search.";
-    return NULL;
-  }
-
-  localdata->pct = strtoul(argv[0],NULL,10);
-
   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_INT;
+  thenode->localdata = NULL;
   thenode->exe = oppct_exe;
   thenode->free = oppct_free;
 
   return thenode;
 }
 
-void *oppct_exe(struct searchNode *thenode, int type, void *theinput) {
-  int nonop;
+void *oppct_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   int i;
+  int ops;
   chanindex *cip = (chanindex *)theinput;
-  struct oppct_localdata *localdata;
-
-  localdata = thenode->localdata;
   
-  if (cip->channel==NULL)
-    return falseval(type);
+  if (cip->channel==NULL || cip->channel->users->totalusers==0)
+    return (void *)0;
   
-  nonop=(cip->channel->users->totalusers)-((cip->channel->users->totalusers*localdata->pct)/100);
+  ops=0;
   
   for (i=0;i<cip->channel->users->hashsize;i++) {
     if (cip->channel->users->content[i]!=nouser) {
-      if (!(cip->channel->users->content[i] & CUMODE_OP)) {
-        if (!nonop--) {
-          return falseval(type);
-        }
+      if (cip->channel->users->content[i] & CUMODE_OP) {
+        ops++;
       }
     }
   }
 
-  return trueval(type);
+  return (void *)(long)((ops * 100) / cip->channel->users->totalusers);
 }
 
-void oppct_free(struct searchNode *thenode) {
-  free(thenode->localdata);
+void oppct_free(searchCtx *ctx, struct searchNode *thenode) {
+  ctx->reply(senderNSExtern, "Notice: oppct is deprecated by cumodepct");
   free(thenode);
 }