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 2010/03/05 19:30:20 UTC
svn commit: r919531 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Author: trawick
Date: Fri Mar 5 18:30:20 2010
New Revision: 919531
URL: http://svn.apache.org/viewvc?rev=919531&view=rev
Log:
revert r918671; these four functions don't need to be
addressible except via the function pointers in the
EXTENSION_CONTROL_BLOCK
Modified:
httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Modified: httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_isapi.c?rev=919531&r1=919530&r2=919531&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_isapi.c Fri Mar 5 18:30:20 2010
@@ -80,29 +80,6 @@
apr_status_t isapi_lookup(apr_pool_t *p, server_rec *s, request_rec *r,
const char *fpath, isapi_loaded** isa);
-/* In addition to being provided via the EXTENSION_CONTROL_BLOCK,
- * these four are also callable directly.
- */
-int APR_THREAD_FUNC GetServerVariable (isapi_cid *cid,
- char *variable_name,
- void *buf_ptr,
- apr_uint32_t *buf_size);
-
-int APR_THREAD_FUNC ReadClient(isapi_cid *cid,
- void *buf_data,
- apr_uint32_t *buf_size);
-
-int APR_THREAD_FUNC WriteClient(isapi_cid *cid,
- void *buf_ptr,
- apr_uint32_t *size_arg,
- apr_uint32_t flags);
-
-int APR_THREAD_FUNC ServerSupportFunction(isapi_cid *cid,
- apr_uint32_t HSE_code,
- void *buf_ptr,
- apr_uint32_t *buf_size,
- apr_uint32_t *data_type);
-
static void *create_isapi_dir_config(apr_pool_t *p, char *dummy)
{
isapi_dir_conf *dir = apr_palloc(p, sizeof(isapi_dir_conf));
@@ -508,10 +485,10 @@
apr_thread_mutex_t *completed;
};
-int APR_THREAD_FUNC GetServerVariable (isapi_cid *cid,
- char *variable_name,
- void *buf_ptr,
- apr_uint32_t *buf_size)
+static int APR_THREAD_FUNC GetServerVariable (isapi_cid *cid,
+ char *variable_name,
+ void *buf_ptr,
+ apr_uint32_t *buf_size)
{
request_rec *r = cid->r;
const char *result;
@@ -610,9 +587,9 @@
return 0;
}
-int APR_THREAD_FUNC ReadClient(isapi_cid *cid,
- void *buf_data,
- apr_uint32_t *buf_size)
+static int APR_THREAD_FUNC ReadClient(isapi_cid *cid,
+ void *buf_data,
+ apr_uint32_t *buf_size)
{
request_rec *r = cid->r;
apr_uint32_t read = 0;
@@ -827,10 +804,10 @@
return ate;
}
-int APR_THREAD_FUNC WriteClient(isapi_cid *cid,
- void *buf_ptr,
- apr_uint32_t *size_arg,
- apr_uint32_t flags)
+static int APR_THREAD_FUNC WriteClient(isapi_cid *cid,
+ void *buf_ptr,
+ apr_uint32_t *size_arg,
+ apr_uint32_t flags)
{
request_rec *r = cid->r;
conn_rec *c = r->connection;
@@ -883,11 +860,11 @@
return (rv == APR_SUCCESS);
}
-int APR_THREAD_FUNC ServerSupportFunction(isapi_cid *cid,
- apr_uint32_t HSE_code,
- void *buf_ptr,
- apr_uint32_t *buf_size,
- apr_uint32_t *data_type)
+static int APR_THREAD_FUNC ServerSupportFunction(isapi_cid *cid,
+ apr_uint32_t HSE_code,
+ void *buf_ptr,
+ apr_uint32_t *buf_size,
+ apr_uint32_t *data_type)
{
request_rec *r = cid->r;
conn_rec *c = r->connection;