From: Doug MacEachern <dougm@apache.org>
Date: Wed, 18 Jul 2001 20:35:07 +0000 (+0000)
Subject: s/destroy/free/g; likeness to SSL naming
X-Git-Tag: 2.0.21~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=506b33a955544ec7bcbf2dce7641ce634afc5363;p=apache

s/destroy/free/g; likeness to SSL naming


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

diff --git a/modules/tls/mod_tls.c b/modules/tls/mod_tls.c
index 5aee9a08e9..7bc49d6d06 100644
--- a/modules/tls/mod_tls.c
+++ b/modules/tls/mod_tls.c
@@ -119,7 +119,7 @@ static const char *tls_cert_file(cmd_parms *cmd, void *dummy, const char *arg)
 
 static apr_status_t tls_filter_cleanup(void *data)
 {
-    SSLStateMachine_destroy((SSLStateMachine *)data);
+    SSLStateMachine_free((SSLStateMachine *)data);
     return APR_SUCCESS;
 }
 
diff --git a/modules/tls/openssl_state_machine.c b/modules/tls/openssl_state_machine.c
index 207b06c0fb..0d7d5e0d86 100644
--- a/modules/tls/openssl_state_machine.c
+++ b/modules/tls/openssl_state_machine.c
@@ -146,7 +146,7 @@ SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile,
     if (n <= 0) {
         SSLStateMachine_print_error(pMachine,
                                     "Error opening certificate file:");
-        SSLStateMachine_destroy(pMachine);
+        SSLStateMachine_free(pMachine);
         return NULL;
     }
 
@@ -155,7 +155,7 @@ SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile,
     if (n <= 0) {
         SSLStateMachine_print_error(pMachine,
                                     "Error opening private key file:");
-        SSLStateMachine_destroy(pMachine);
+        SSLStateMachine_free(pMachine);
         return NULL;
     }
 
@@ -173,7 +173,7 @@ SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile,
     return pMachine;
     }
 
-void SSLStateMachine_destroy(SSLStateMachine *pMachine)
+void SSLStateMachine_free(SSLStateMachine *pMachine)
 {
     if (pMachine->pCtx) {
         SSL_CTX_free(pMachine->pCtx);
diff --git a/modules/tls/openssl_state_machine.h b/modules/tls/openssl_state_machine.h
index 581baf9c9b..a041449512 100644
--- a/modules/tls/openssl_state_machine.h
+++ b/modules/tls/openssl_state_machine.h
@@ -3,7 +3,7 @@ typedef struct SSLStateMachine SSLStateMachine;
 void SSLStateMachine_init(void);
 SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile,
 				     const char *szKeyFile);
-void SSLStateMachine_destroy(SSLStateMachine *pMachine);
+void SSLStateMachine_free(SSLStateMachine *pMachine);
 void SSLStateMachine_read_inject(SSLStateMachine *pMachine,
 				 const unsigned char *aucBuf,int nBuf);
 int SSLStateMachine_read_extract(SSLStateMachine *pMachine,