From 7f6f1a2cdcffd978d8c49c50c57c7c77019eaf39 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 16 Aug 2001 19:56:47 +0000 Subject: [PATCH] fix a few mod_ssl warnings for stuff like function which were neither static nor prototyped, char * vs. const char *, etc. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90238 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_config.c | 6 +++--- modules/ssl/ssl_engine_ext.c | 8 ++++---- modules/ssl/ssl_engine_io.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index 60ec0dcb64..039cc8f518 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -639,7 +639,7 @@ const char *ssl_cmd_SSLSessionCache( cmd_parms *cmd, void *ctx, const char *arg) { SSLModConfigRec *mc = myModConfig(cmd->server); - const char *err; + const char *err, *colon; char *cp, *cp2; int maxsize; @@ -664,9 +664,9 @@ const char *ssl_cmd_SSLSessionCache( return "SSLSessionCache: shared memory cache not useable on this platform"; #endif mc->nSessionCacheMode = SSL_SCMODE_SHMHT; - cp = ap_strchr_c(arg, ':'); + colon = ap_strchr_c(arg, ':'); mc->szSessionCacheDataFile = (char *)apr_pstrdup(mc->pPool, - ap_server_root_relative(cmd->pool, cp+1)); + ap_server_root_relative(cmd->pool, colon+1)); mc->tSessionCacheDataTable = NULL; mc->nSessionCacheDataSize = 1024*512; /* 512KB */ if ((cp = strchr(mc->szSessionCacheDataFile, '(')) != NULL) { diff --git a/modules/ssl/ssl_engine_ext.c b/modules/ssl/ssl_engine_ext.c index 6c69751767..15c12a064c 100644 --- a/modules/ssl/ssl_engine_ext.c +++ b/modules/ssl/ssl_engine_ext.c @@ -108,8 +108,8 @@ void ssl_ext_unregister(void) ** _________________________________________________________________ */ -static char *ssl_ext_mlc_log_c(request_rec *r, char *a); -static char *ssl_ext_mlc_log_x(request_rec *r, char *a); +static const char *ssl_ext_mlc_log_c(request_rec *r, char *a); +static const char *ssl_ext_mlc_log_x(request_rec *r, char *a); /* * register us for the mod_log_config function registering phase @@ -143,7 +143,7 @@ static void ssl_ext_mlc_unregister(void) * implement the %{..}c log function * (we are the only function) */ -static char *ssl_ext_mlc_log_c(request_rec *r, char *a) +static const char *ssl_ext_mlc_log_c(request_rec *r, char *a) { char *result; @@ -171,7 +171,7 @@ static char *ssl_ext_mlc_log_c(request_rec *r, char *a) * extend the implementation of the %{..}x log function * (there can be more functions) */ -static char *ssl_ext_mlc_log_x(request_rec *r, char *a) +static const char *ssl_ext_mlc_log_x(request_rec *r, char *a) { char *result; diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 3787386007..6dcad77ca0 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -334,7 +334,7 @@ static apr_status_t churn (SSLFilterRec *pRec, return churn_output(pRec); } -apr_status_t ssl_io_filter_Output(ap_filter_t *f,apr_bucket_brigade *pbbIn) +static apr_status_t ssl_io_filter_Output(ap_filter_t *f,apr_bucket_brigade *pbbIn) { SSLFilterRec *pRec=f->ctx; apr_bucket *pbktIn; @@ -391,8 +391,8 @@ apr_status_t ssl_io_filter_Output(ap_filter_t *f,apr_bucket_brigade *pbbIn) return APR_SUCCESS; } -apr_status_t ssl_io_filter_Input(ap_filter_t *f,apr_bucket_brigade *pbbOut, - ap_input_mode_t eMode, apr_off_t *readbytes) +static apr_status_t ssl_io_filter_Input(ap_filter_t *f,apr_bucket_brigade *pbbOut, + ap_input_mode_t eMode, apr_off_t *readbytes) { apr_status_t ret; SSLFilterRec *pRec = f->ctx; @@ -417,7 +417,7 @@ apr_status_t ssl_io_filter_Input(ap_filter_t *f,apr_bucket_brigade *pbbOut, return APR_SUCCESS; } -apr_status_t ssl_io_filter_cleanup (void *data) +static apr_status_t ssl_io_filter_cleanup (void *data) { apr_status_t ret; SSLFilterRec *pRec = (SSLFilterRec *)data; -- 2.40.0