From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 2 Aug 2001 05:25:53 +0000 (+0000)
Subject:   Adapt to changed declaration of apr_pool_sub_make()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=627761f7f4dd39c15a6d283bcbc7e7cbe6acae11;p=thirdparty%2Fapache%2Fhttpd.git

  Adapt to changed declaration of apr_pool_sub_make()


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

diff --git a/ssl_engine_ds.c b/ssl_engine_ds.c
index 4782f454452..72bb442b612 100644
--- a/ssl_engine_ds.c
+++ b/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/ssl_engine_init.c b/ssl_engine_init.c
index ee68a29e853..5d17191be68 100644
--- a/ssl_engine_init.c
+++ b/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/ssl_scache_dbm.c b/ssl_scache_dbm.c
index 9583b73f2d5..4bb704518a5 100644
--- a/ssl_scache_dbm.c
+++ b/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/ssl_util_ssl.c b/ssl_util_ssl.c
index da4730024fb..8f3f8fe2d5b 100644
--- a/ssl_util_ssl.c
+++ b/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;