From 379c6db4f38db767257ce85516e8d68951df5561 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 15 Jan 2014 17:42:39 +0000 Subject: [PATCH] follow-up to r1554161, r1554168, r1554170, r1554175, r1554188, and r1554195: axe unnecessary initialization/pool allocation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1558483 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_authnz_ldap.c | 2 +- modules/aaa/mod_authz_dbd.c | 2 +- modules/aaa/mod_authz_dbm.c | 2 +- modules/aaa/mod_authz_groupfile.c | 2 +- modules/aaa/mod_authz_host.c | 2 +- modules/aaa/mod_authz_user.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c index 86eb958052..4ed6c21b8a 100644 --- a/modules/aaa/mod_authnz_ldap.c +++ b/modules/aaa/mod_authnz_ldap.c @@ -1400,7 +1400,7 @@ static const char *ldap_parse_config(cmd_parms *cmd, const char *require_line, const void **parsed_require_line) { const char *expr_err = NULL; - ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + ap_expr_info_t *expr; expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, &expr_err, NULL); diff --git a/modules/aaa/mod_authz_dbd.c b/modules/aaa/mod_authz_dbd.c index 8da0ccaec3..30749914a7 100644 --- a/modules/aaa/mod_authz_dbd.c +++ b/modules/aaa/mod_authz_dbd.c @@ -327,7 +327,7 @@ static const char *dbd_parse_config(cmd_parms *cmd, const char *require_line, const void **parsed_require_line) { const char *expr_err = NULL; - ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + ap_expr_info_t *expr; expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, &expr_err, NULL); diff --git a/modules/aaa/mod_authz_dbm.c b/modules/aaa/mod_authz_dbm.c index 4e132e0f29..843d9a8e43 100644 --- a/modules/aaa/mod_authz_dbm.c +++ b/modules/aaa/mod_authz_dbm.c @@ -279,7 +279,7 @@ static const char *dbm_parse_config(cmd_parms *cmd, const char *require_line, const void **parsed_require_line) { const char *expr_err = NULL; - ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + ap_expr_info_t *expr; expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, &expr_err, NULL); diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c index 685309f035..261f2fb40f 100644 --- a/modules/aaa/mod_authz_groupfile.c +++ b/modules/aaa/mod_authz_groupfile.c @@ -273,7 +273,7 @@ static const char *groupfile_parse_config(cmd_parms *cmd, const char *require_li const void **parsed_require_line) { const char *expr_err = NULL; - ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + ap_expr_info_t *expr; expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, &expr_err, NULL); diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c index f5f1a0ddbc..83fc6e6c71 100644 --- a/modules/aaa/mod_authz_host.c +++ b/modules/aaa/mod_authz_host.c @@ -228,7 +228,7 @@ static const char *host_parse_config(cmd_parms *cmd, const char *require_line, const void **parsed_require_line) { const char *expr_err = NULL; - ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + ap_expr_info_t *expr; expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, &expr_err, NULL); diff --git a/modules/aaa/mod_authz_user.c b/modules/aaa/mod_authz_user.c index 0f45395ed8..881f77f110 100644 --- a/modules/aaa/mod_authz_user.c +++ b/modules/aaa/mod_authz_user.c @@ -97,7 +97,7 @@ static const char *user_parse_config(cmd_parms *cmd, const char *require_line, const void **parsed_require_line) { const char *expr_err = NULL; - ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + ap_expr_info_t *expr; expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, &expr_err, NULL); -- 2.40.0