rem: struct filter_list_struct *lp, int flags)
add: struct filter_list_struct *lp)
context: static BOOL setup_merge_file(struct filter_struct *ex,			     struct filter_list_struct *lp, int flags){	char buf[MAXPATHLEN];	char *x, *y, *pat = ex->pattern;	unsigned int len;	if (!(x = parse_merge_name(pat, NULL, 0)) || *x != '/')		return 0;	y = strrchr(x, '/');	*y = '\0';	ex->pattern = strdup(y+1);	if (!*x)		x = "/";	if (*x == '/')		strlcpy(buf, x, MAXPATHLEN);	else		pathjoin(buf, MAXPATHLEN, dirbuf, x);	len = clean_fname(buf, 1);	if (len != 1 && len < MAXPATHLEN-1) {		buf[len++] = '/';		buf[len] = '\0';	}	/* This ensures that the specified dir is a parent of the transfer. */	for (x = buf, y = dirbuf; *x && *x == *y; x++, y++) {}	if (*x)		y += strlen(y); /* nope -- skip the scan */	parent_dirscan = True;	while (*y) {		char save[MAXPATHLEN];		strlcpy(save, y, MAXPATHLEN);		*y = '\0';		dirbuf_len = y - dirbuf;		strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf));		add_filter_file(lp, buf, flags | XFLG_ANCHORED2ABS);		if (ex->match_flags & MATCHFLG_NO_INHERIT)			lp->head = NULL;		lp->tail = NULL;		strlcpy(y, save, MAXPATHLEN);		while ((*x++ = *y++) != '/') {}	}	parent_dirscan = False;	free(pat);	return 1;}