From: Jim Jagielski <jim@apache.org>
Date: Tue, 21 Jan 2014 16:45:04 +0000 (+0000)
Subject: Merge r1558483 from trunk:
X-Git-Tag: 2.4.8~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=008f588394b8fad071073c4d4155b7a7ad11dd8a;p=apache

Merge r1558483 from trunk:

follow-up to r1554161, r1554168, r1554170, r1554175, r1554188, and r1554195:

axe unnecessary initialization/pool allocation

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560083 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 522949cae6..5b260c5be1 100644
--- a/STATUS
+++ b/STATUS
@@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_auth*z scan-build warnings in new code for 2.4.8
-    trunk patch: https://svn.apache.org/r1558483
-    2.4.x patch: trunk patch works
-    +1: trawick, covener, jim
-
   * ssl_util_ocsp scan-build warning in old code
     (the code is clearly wrong but completely harmless AFAICT)
     trunk patch: https://svn.apache.org/r1534890
diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 50921cde3d..53a6085372 100644
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -1377,7 +1377,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 cabe65601b..c329eacd34 100644
--- a/modules/aaa/mod_authz_dbm.c
+++ b/modules/aaa/mod_authz_dbm.c
@@ -280,7 +280,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 590e8da296..70e6815305 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -274,7 +274,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);