Style guides at httpd are pretty clear, macro values are UPCASE, please?

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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 80b5cb8568fff3e560ad56d4434bb88ebdeff81e..317cbfbf2aad7267ba50f5ff94d224a1e2d3328b 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -314,9 +314,9 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
     ssl_scache_status_register(pconf);
 
     /* Register mutex type names so they can be configured with Mutex */
-    ap_mutex_register(pconf, ssl_cache_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
+    ap_mutex_register(pconf, SSL_CACHE_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
 #ifdef HAVE_OCSP_STAPLING
-    ap_mutex_register(pconf, ssl_stapling_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
+    ap_mutex_register(pconf, SSL_STAPLING_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
 #endif
 
     return OK;

diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c
index fccd97991bd9efe71d7cff0a03dc1d581a3dff5c..9c0b996c44419479ec7ce40c5af478db34b67b5e 100644 (file)
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -47,7 +47,7 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p)
         return TRUE;
     }
 
-    if ((rv = ap_global_mutex_create(&mc->pMutex, ssl_cache_mutex_type, NULL,
+    if ((rv = ap_global_mutex_create(&mc->pMutex, SSL_CACHE_MUTEX_TYPE, NULL,
                                      s, s->process->pool, 0))
             != APR_SUCCESS) {
         return FALSE;
@@ -74,10 +74,10 @@ int ssl_mutex_reinit(server_rec *s, apr_pool_t *p)
         if (lockfile)
             ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
                          "Cannot reinit %s mutex with file `%s'",
-                         ssl_cache_mutex_type, lockfile);
+                         SSL_CACHE_MUTEX_TYPE, lockfile);
         else
             ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
-                         "Cannot reinit %s mutex", ssl_cache_mutex_type);
+                         "Cannot reinit %s mutex", SSL_CACHE_MUTEX_TYPE);
         return FALSE;
     }
     return TRUE;

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index fbd33bf7e884f789c45ce9c2a87edb20fab56fcf..313ceeb4fd2d97a412a531a7876d09e4aa1dd554 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -728,8 +728,8 @@ int          ssl_stapling_mutex_init(server_rec *, apr_pool_t *);
 int          ssl_stapling_mutex_reinit(server_rec *, apr_pool_t *);
 
 /* mutex type names for Mutex directive */
-#define ssl_cache_mutex_type    "ssl-cache"
-#define ssl_stapling_mutex_type "ssl-stapling"
+#define SSL_CACHE_MUTEX_TYPE    "ssl-cache"
+#define SSL_STAPLING_MUTEX_TYPE "ssl-stapling"
 
 /**  Logfile Support  */
 void         ssl_die(void);

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index 12d3749c744c551e7236b6502b820b0e5899e0d4..e069fae848bc7a78c6630db89bebeee850df0085 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -482,7 +482,7 @@ int ssl_stapling_mutex_init(server_rec *s, apr_pool_t *p)
     }
 
     if ((rv = ap_global_mutex_create(&mc->stapling_mutex,
-                                     ssl_stapling_mutex_type, NULL, s,
+                                     SSL_STAPLING_MUTEX_TYPE, NULL, s,
                                      s->process->pool, 0)) != APR_SUCCESS) {
         return FALSE;
     }
@@ -506,11 +506,11 @@ int ssl_stapling_mutex_reinit(server_rec *s, apr_pool_t *p)
         if (lockfile) {
             ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
                          "Cannot reinit %s mutex with file `%s'",
-                         ssl_stapling_mutex_type, lockfile);
+                         SSL_STAPLING_MUTEX_TYPE, lockfile);
         }
         else {
             ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
-                         "Cannot reinit %s mutex", ssl_stapling_mutex_type);
+                         "Cannot reinit %s mutex", SSL_STAPLING_MUTEX_TYPE);
         }
         return FALSE;
     }