build: Clean up workspaces code a bit.

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

diff --git a/newsearch/ns-channel.c b/newsearch/ns-channel.c
index 934698de8b4e0e9e1086df7e932885d76da28676..3a79920f309e0fbdfb011d4438a13d7f65f867da 100644 (file)
--- a/newsearch/ns-channel.c
+++ b/newsearch/ns-channel.c
@@ -12,21 +12,22 @@
 void *channel_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
 void channel_free(searchCtx *ctx, struct searchNode *thenode);
 
-struct searchNode *channel_parse(searchCtx *ctx, int type, int argc, char **argv) {
-  struct searchNode *thenode;
+struct searchNode *channel_parse(searchCtx *ctx, int argc, char **argv) {
+  struct searchNode *thenode, *convsn;
   channel *cp;
-
-  if (type != SEARCHTYPE_NICK) {
-    parseError = "channel: this function is only valid for nick searches.";
-    return NULL;
-  }
-
+  char *p;
+  
   if (argc<1) {
     parseError = "channel: usage: channel <channel name>";
     return NULL;
   }
 
-  if (!(cp=findchannel(argv[0]))) {
+  if (!(convsn=argtoconststr("channel", ctx, argv[0], &p)))
+    return NULL;
+
+  cp=findchannel(p);
+  convsn->free(ctx, convsn);
+  if (!cp) {
     parseError = "channel: unknown channel";
     return NULL;
   }