void *match_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
void match_free(searchCtx *ctx, struct searchNode *thenode);
-struct searchNode *match_parse(searchCtx *ctx, int type, int argc, char **argv) {
+struct searchNode *match_parse(searchCtx *ctx, int argc, char **argv) {
struct match_localdata *localdata;
struct searchNode *thenode;
struct searchNode *targnode, *patnode;
}
/* @fixme check this works with new parsing semantics */
- targnode = ctx->parser(ctx, type, argv[0]);
+ targnode = ctx->parser(ctx, argv[0]);
if (!(targnode = coerceNode(ctx,targnode, RETURNTYPE_STRING)))
return NULL;
- patnode = ctx->parser(ctx, type, argv[1]);
+ patnode = ctx->parser(ctx, argv[1]);
if (!(patnode = coerceNode(ctx,patnode, RETURNTYPE_STRING))) {
(targnode->free)(ctx, targnode);
return NULL;
if (!(localdata=(struct match_localdata *)malloc(sizeof (struct match_localdata)))) {
parseError = "malloc: could not allocate memory for this search.";
+ (targnode->free)(ctx, targnode);
+ (patnode->free)(ctx, patnode);
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.";
+ (targnode->free)(ctx, targnode);
+ (patnode->free)(ctx, patnode);
free(localdata);
return NULL;
}