You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2004/11/01 11:00:52 UTC
cvs commit: httpd-2.0/modules/experimental mod_filter.c
niq 2004/11/01 02:00:52
Modified: modules/experimental mod_filter.c
Log:
Fix compile trouble.
Revision Changes Path
1.24 +12 -13 httpd-2.0/modules/experimental/mod_filter.c
Index: mod_filter.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_filter.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_filter.c 31 Oct 2004 18:00:43 -0000 1.23
+++ mod_filter.c 1 Nov 2004 10:00:52 -0000 1.24
@@ -472,8 +472,6 @@
static const char *filter_declare(cmd_parms *cmd, void *CFG, const char *fname,
const char *place)
{
- const char *eq;
- char *tmpname = "";
mod_filter_cfg *cfg = (mod_filter_cfg *)CFG;
ap_filter_rec_t *filter;
@@ -506,12 +504,15 @@
static const char *filter_provider(cmd_parms *cmd, void *CFG, const char *args)
{
+ mod_filter_cfg *cfg = CFG;
int flags;
ap_filter_provider_t *provider;
const char *rxend;
const char *c;
char *str;
const char *eq;
+ ap_filter_rec_t* frec;
+ ap_filter_rec_t* provider_frec;
/* insist on exactly four arguments */
const char *fname = ap_getword_conf(cmd->pool, &args) ;
@@ -524,13 +525,9 @@
}
/* fname has been declared with DeclareFilter, so we can look it up */
- mod_filter_cfg *cfg = CFG;
- ap_filter_rec_t *frec = apr_hash_get(cfg->live_filters, fname,
- APR_HASH_KEY_STRING);
- /* if provider has been registered, we can look it up */
- ap_filter_rec_t *provider_frec = ap_get_output_filter_handle(pname);
- /* or if provider is mod_filter itself, we can also look it up */
+ frec = apr_hash_get(cfg->live_filters, fname, APR_HASH_KEY_STRING);
+ /* or if provider is mod_filter itself, we can also look it up */
if (!frec) {
c = filter_declare(cmd, CFG, fname, NULL);
if ( c ) {
@@ -539,15 +536,17 @@
frec = apr_hash_get(cfg->live_filters, fname, APR_HASH_KEY_STRING);
}
+ if (!frec) {
+ return apr_psprintf(cmd->pool, "Undeclared smart filter %s", fname);
+ }
+
+ /* if provider has been registered, we can look it up */
+ provider_frec = ap_get_output_filter_handle(pname);
if (!provider_frec) {
provider_frec = apr_hash_get(cfg->live_filters, pname,
APR_HASH_KEY_STRING);
}
-
- if (!frec) {
- return apr_psprintf(cmd->pool, "Undeclared smart filter %s", fname);
- }
- else if (!provider_frec) {
+ if (!provider_frec) {
return apr_psprintf(cmd->pool, "Unknown filter provider %s", pname);
}