-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.24 2008/04/06 14:54:26 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.25 2008/04/06 15:18:38 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
*
* Revisions :
* $Log: urlmatch.c,v $
+ * Revision 1.25 2008/04/06 15:18:38 fabiankeil
+ * Oh well, rename the --enable-pcre-host-patterns option to
+ * --enable-extended-host-patterns as it's not really PCRE syntax.
+ *
* Revision 1.24 2008/04/06 14:54:26 fabiankeil
* Use PCRE syntax in host patterns when configured
* with --enable-pcre-host-patterns.
url->dbuffer = strdup(host_pattern);
if (NULL == url->dbuffer)
{
- freez(url->spec);
- freez(url->path);
- regfree(url->preg);
- freez(url->preg);
+ free_url_spec(url);
return JB_ERR_MEMORY;
}
if (url->dcount < 0)
{
- freez(url->spec);
- freez(url->path);
- regfree(url->preg);
- freez(url->preg);
- freez(url->dbuffer);
- url->dcount = 0;
+ free_url_spec(url);
return JB_ERR_MEMORY;
}
else if (url->dcount != 0)
url->dvec = (char **)malloc(size);
if (NULL == url->dvec)
{
- freez(url->spec);
- freez(url->path);
- regfree(url->preg);
- freez(url->preg);
- freez(url->dbuffer);
- url->dcount = 0;
+ free_url_spec(url);
return JB_ERR_MEMORY;
}
errlen = sizeof(rebuf) - 1;
}
rebuf[errlen] = '\0';
-
log_error(LOG_LEVEL_ERROR, "error compiling %s: %s", url->spec, rebuf);
-
- freez(url->spec);
- regfree(url->tag_regex);
- freez(url->tag_regex);
+ free_url_spec(url);
return JB_ERR_PARSE;
}
url->path = strdup(p);
if (NULL == url->path)
{
- freez(url->spec);
+ free_url_spec(url);
return JB_ERR_MEMORY;
}
*p = '\0';
{
if (NULL == (url->preg = zalloc(sizeof(*url->preg))))
{
- freez(url->spec);
- freez(url->path);
+ free_url_spec(url);
return JB_ERR_MEMORY;
}
errlen = sizeof(rebuf) - (size_t)1;
}
rebuf[errlen] = '\0';
-
log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
url->spec, rebuf);
-
- freez(url->spec);
- freez(url->path);
- regfree(url->preg);
- freez(url->preg);
+ free_url_spec(url);
return JB_ERR_PARSE;
}
#else
freez(url->dbuffer);
freez(url->dvec);
+ url->dcount = 0;
#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
freez(url->path);
freez(url->port_list);