Adapt to changed declaration of apr_pool_sub_make()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89871 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_ds.c b/modules/ssl/ssl_engine_ds.c
index 4782f4544523894b6e3804a361997105c11dc058..72bb442b6122897d9b959e0b12a39d4b8e33b87d 100644 (file)
--- a/modules/ssl/ssl_engine_ds.c
+++ b/modules/ssl/ssl_engine_ds.c
@@ -76,7 +76,8 @@ ssl_ds_array *ssl_ds_array_make(apr_pool_t *p, int size)
     if ((a = (ssl_ds_array *)apr_palloc(p, sizeof(ssl_ds_array))) == NULL)
         return NULL;
     a->pPool = p;
-    if ((a->pSubPool = apr_pool_sub_make(p, NULL)) == NULL)
+    apr_pool_sub_make(&a->pSubPool, p, NULL);
+    if (a->pSubPool == NULL)
         return NULL;
     a->aData = apr_array_make(a->pSubPool, 2, size);
     return a;
@@ -130,7 +131,8 @@ ssl_ds_table *ssl_ds_table_make(apr_pool_t *p, int size)
     if ((t = (ssl_ds_table *)apr_palloc(p, sizeof(ssl_ds_table))) == NULL)
         return NULL;
     t->pPool = p;
-    if ((t->pSubPool = apr_pool_sub_make(p, NULL)) == NULL)
+    apr_pool_sub_make(&t->pSubPool, p, NULL);
+    if (t->pSubPool == NULL)
         return NULL;
     t->aKey  = apr_array_make(t->pSubPool, 2, MAX_STRING_LEN);
     t->aData = apr_array_make(t->pSubPool, 2, size);

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index ee68a29e853081e874c3429100e2060f25055ab3..5d17191be68a2c239154fb4c441dae98bc022920 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -904,7 +904,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_pool_t *pp, char *cp
      * is remains in memory for the complete operation time of
      * the server.
      */
-    p = apr_pool_sub_make(pp, NULL);
+    apr_pool_sub_make(&p, pp, NULL);
 
     /*
      * Start with a empty stack/list where new

diff --git a/modules/ssl/ssl_scache_dbm.c b/modules/ssl/ssl_scache_dbm.c
index 9583b73f2d50c3b05ab976df75cd099ce6ca58fe..4bb704518a5f0b800d381ee93c12c660621de506 100644 (file)
--- a/modules/ssl/ssl_scache_dbm.c
+++ b/modules/ssl/ssl_scache_dbm.c
@@ -116,7 +116,8 @@ void ssl_scache_dbm_kill(server_rec *s)
     SSLModConfigRec *mc = myModConfig(s);
     apr_pool_t *p;
 
-    if ((p = apr_pool_sub_make(mc->pPool, NULL)) != NULL) {
+    apr_pool_sub_make(&p, mc->pPool, NULL)
+    if (p != NULL) {
         /* the correct way */
         unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_DIR, NULL));
         unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_PAG, NULL));
@@ -328,7 +329,8 @@ void ssl_scache_dbm_expire(server_rec *s)
     ssl_mutex_on(s);
     for (;;) {
         /* allocate the key array in a memory sub pool */
-        if ((p = apr_pool_sub_make(mc->pPool, NULL)) == NULL)
+        apr_pool_sub_make(&p, mc->pPool, NULL)
+        if (p == NULL)
             break;
         if ((keylist = apr_palloc(p, sizeof(dbmkey)*KEYMAX)) == NULL) {
             apr_pool_destroy(p);

diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index da4730024fb3ef56a02247855d082d91bb68e4d9..8f3f8fe2d5b81c61604f043d727b162a4072a1f6 100644 (file)
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -420,7 +420,7 @@ BOOL SSL_load_CrtAndKeyInfo_path(apr_pool_t *p, STACK_OF(X509_INFO) *sk, char *p
     char *fullname;
     BOOL ok;
 
-    sp = apr_pool_sub_make(p, NULL);
+    apr_pool_sub_make(&sp, p, NULL);
     if (apr_dir_open(&dir, pathname, sp)) != APR_SUCCESS) {
         apr_pool_destroy(sp);
         return FALSE;

diff --git a/modules/test/mod_test_util_uri.c b/modules/test/mod_test_util_uri.c
index dbe340568dd49f082e31c8a60395a3086cc57a6e..3baae44bbd3305ee48cf8b38b199fd48a4cc9162 100644 (file)
--- a/modules/test/mod_test_util_uri.c
+++ b/modules/test/mod_test_util_uri.c
@@ -207,7 +207,7 @@ static unsigned iterate_pieces(request_rec *r, const test_uri_t *pieces, int row
        }
        *strp = 0;
 
-       sub = apr_pool_sub_make(r->pool);
+       apr_pool_sub_make(&sub, r->pool, NULL);
        status = apr_uri_parse_components(sub, input_uri, &result);
        if (status == APR_SUCCESS) {
 #define CHECK(f)                                                       \