diff options
Diffstat (limited to 'utility/config.c')
-rw-r--r-- | utility/config.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/utility/config.c b/utility/config.c index 28bb5cd..3b6e946 100644 --- a/utility/config.c +++ b/utility/config.c | |||
@@ -55,11 +55,12 @@ static apr_status_t config_set_loglevel(config_t *cfg, config_opt_t *opt, | |||
55 | static apr_status_t config_set_inputfile(config_t *cfg, config_opt_t *opt, | 55 | static apr_status_t config_set_inputfile(config_t *cfg, config_opt_t *opt, |
56 | int argc, const char **argv) | 56 | int argc, const char **argv) |
57 | { | 57 | { |
58 | char **newp; | 58 | config_filestat_t *newp; |
59 | if (argc != 2) | 59 | if (argc != 2) |
60 | return APR_EINVAL; | 60 | return APR_EINVAL; |
61 | newp = (char **)apr_array_push(cfg->input_files); | 61 | newp = (config_filestat_t *)apr_array_push(cfg->input_files); |
62 | *newp = apr_pstrdup(cfg->pool, argv[1]); | 62 | newp->fname = apr_pstrdup(cfg->pool, argv[1]); |
63 | newp->result = "Not Parsed"; | ||
63 | return APR_SUCCESS; | 64 | return APR_SUCCESS; |
64 | } | 65 | } |
65 | 66 | ||
@@ -241,20 +242,20 @@ void config_dump(config_t *cfg) | |||
241 | printf("\n"); | 242 | printf("\n"); |
242 | } | 243 | } |
243 | printf("Filters:\n>> Line:\n"); | 244 | printf("Filters:\n>> Line:\n"); |
244 | filters = cfg->linefilters->elts; | 245 | filters = (config_filter_t *)cfg->linefilters->elts; |
245 | for (i=0; i<cfg->linefilters->nelts; i++) { | 246 | for (i=0; i<cfg->linefilters->nelts; i++) { |
246 | printf(">>>> %c \"%s\" (%pp)\n",filters[i].negative ? '-':'+', | 247 | printf(">>>> %c \"%s\" (%pp)\n",filters[i].negative ? '-':'+', |
247 | filters[i].filter, filters[i].regex); | 248 | filters[i].filter, filters[i].regex); |
248 | } | 249 | } |
249 | printf(">> Pre:\n"); | 250 | printf(">> Pre:\n"); |
250 | filters = cfg->prefilters->elts; | 251 | filters = (config_filter_t *)cfg->prefilters->elts; |
251 | for (i=0; i<cfg->prefilters->nelts; i++) { | 252 | for (i=0; i<cfg->prefilters->nelts; i++) { |
252 | printf(">>>> %s %c \"%s\" (%pp)\n", | 253 | printf(">>>> %s %c \"%s\" (%pp)\n", |
253 | filters[i].field, filters[i].negative ? '-':'+', | 254 | filters[i].field, filters[i].negative ? '-':'+', |
254 | filters[i].filter, filters[i].regex); | 255 | filters[i].filter, filters[i].regex); |
255 | } | 256 | } |
256 | printf(">> Post:\n"); | 257 | printf(">> Post:\n"); |
257 | filters = cfg->postfilters->elts; | 258 | filters = (config_filter_t *)cfg->postfilters->elts; |
258 | for (i=0; i<cfg->postfilters->nelts; i++) { | 259 | for (i=0; i<cfg->postfilters->nelts; i++) { |
259 | printf(">>>> %s %c \"%s\" (%pp)\n", | 260 | printf(">>>> %s %c \"%s\" (%pp)\n", |
260 | filters[i].field, filters[i].negative ? '-':'+', | 261 | filters[i].field, filters[i].negative ? '-':'+', |
@@ -345,7 +346,7 @@ config_t *config_create(apr_pool_t *p) | |||
345 | cfg->loglevel = LOGLEVEL_ERROR; | 346 | cfg->loglevel = LOGLEVEL_ERROR; |
346 | cfg->summary = 1; | 347 | cfg->summary = 1; |
347 | cfg->transactions = 1; | 348 | cfg->transactions = 1; |
348 | cfg->input_files = apr_array_make(cfg->pool, 2, sizeof(char *)); | 349 | cfg->input_files = apr_array_make(cfg->pool, 2, sizeof(config_filestat_t)); |
349 | cfg->log_formats = apr_hash_make(cfg->pool); | 350 | cfg->log_formats = apr_hash_make(cfg->pool); |
350 | cfg->output_fields = apr_array_make(cfg->pool, 10, | 351 | cfg->output_fields = apr_array_make(cfg->pool, 10, |
351 | sizeof(config_output_field_t)); | 352 | sizeof(config_output_field_t)); |