You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/08/16 21:56:47 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_config.c ssl_engine_ext.c ssl_engine_io.c
trawick 01/08/16 12:56:47
Modified: modules/ssl ssl_engine_config.c ssl_engine_ext.c
ssl_engine_io.c
Log:
fix a few mod_ssl warnings for stuff like function which were neither
static nor prototyped, char * vs. const char *, etc.
Revision Changes Path
1.14 +3 -3 httpd-2.0/modules/ssl/ssl_engine_config.c
Index: ssl_engine_config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ssl_engine_config.c 2001/08/07 16:19:03 1.13
+++ ssl_engine_config.c 2001/08/16 19:56:47 1.14
@@ -639,7 +639,7 @@
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 @@
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) {
1.7 +4 -4 httpd-2.0/modules/ssl/ssl_engine_ext.c
Index: ssl_engine_ext.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_ext.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ssl_engine_ext.c 2001/07/31 02:10:29 1.6
+++ ssl_engine_ext.c 2001/08/16 19:56:47 1.7
@@ -108,8 +108,8 @@
** _________________________________________________________________
*/
-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 @@
* 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 @@
* 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;
1.20 +4 -4 httpd-2.0/modules/ssl/ssl_engine_io.c
Index: ssl_engine_io.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ssl_engine_io.c 2001/08/16 17:01:53 1.19
+++ ssl_engine_io.c 2001/08/16 19:56:47 1.20
@@ -334,7 +334,7 @@
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 @@
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 @@
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;