ident comparision should use strcmp

[irc/quakenet/newserv.git] / newsearch / newsearch.h

diff --git a/newsearch/newsearch.h b/newsearch/newsearch.h
index 8c7f928f4fac5f515fc8e8d93779583211905f5e..2dc1d0fb1ea60ced0aca9fce966b2b93d605dabc 100644 (file)
--- a/newsearch/newsearch.h
+++ b/newsearch/newsearch.h
@@ -90,6 +90,8 @@ typedef struct searchCtx {
   int lastvar;
   struct searchCmd *searchcmd;
   nick *sender;
+  int limit;
+  void *displayfn;
 } searchCtx;
 
 /* Core functions */
@@ -144,6 +146,8 @@ struct searchNode *size_parse(searchCtx *ctx, int argc, char **argv);
 struct searchNode *name_parse(searchCtx *ctx, int argc, char **argv);
 struct searchNode *topic_parse(searchCtx *ctx, int argc, char **argv);
 struct searchNode *oppct_parse(searchCtx *ctx, int argc, char **argv);
+struct searchNode *cumodecount_parse(searchCtx *ctx, int argc, char **argv);
+struct searchNode *cumodepct_parse(searchCtx *ctx, int argc, char **argv);
 struct searchNode *hostpct_parse(searchCtx *ctx, int argc, char **argv);
 struct searchNode *authedpct_parse(searchCtx *ctx, int argc, char **argv);
 struct searchNode *kick_parse(searchCtx *ctx, int argc, char **argv);
@@ -158,6 +162,7 @@ struct searchNode *var_parse(searchCtx *ctx, int argc, char **argv);
 
 /* Iteraterable functions */
 struct searchNode *channeliter_parse(searchCtx *ctx, int argc, char **argv);
+struct searchNode *nickiter_parse(searchCtx *ctx, int argc, char **argv);
 
 /* Functions that operate on strings */
 struct searchNode *cumodes_parse(searchCtx *ctx, int argc, char **argv);
@@ -187,9 +192,9 @@ void printnick(searchCtx *, nick *, nick *);
 void printuser(searchCtx *, nick *, authname *);
 void printchannel(searchCtx *, nick *, chanindex *);
 
-void nicksearch_exe(struct searchNode *search, searchCtx *sctx, nick *sender, NickDisplayFunc display, int limit);
-void chansearch_exe(struct searchNode *search, searchCtx *sctx, nick *sender, ChanDisplayFunc display, int limit);
-void usersearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, UserDisplayFunc display, int limit);
+void nicksearch_exe(struct searchNode *search, searchCtx *sctx);
+void chansearch_exe(struct searchNode *search, searchCtx *sctx);
+void usersearch_exe(struct searchNode *search, searchCtx *ctx);
 
 int do_nicksearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv);
 int do_chansearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv);
@@ -202,7 +207,7 @@ struct searchVariable *var_register(searchCtx *ctx, char *arg, int type);
 searchNode *var_get(searchCtx *ctx, char *arg);
 void var_setstr(struct searchVariable *v, char *data);
 
-void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *sender);
+void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *sender, void *displayfn, int limit);
 
 /* AST functions */
 
@@ -268,4 +273,6 @@ extern UserDisplayFunc defaultuserfn;
 extern NickDisplayFunc defaultnickfn;
 extern ChanDisplayFunc defaultchanfn;
 
+struct searchNode *argtoconststr(char *command, searchCtx *ctx, char *arg, char **p);
+
 #endif