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/03 20:49:41 UTC
svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Author: trawick
Date: Wed Mar 3 19:49:41 2010
New Revision: 918665
URL: http://svn.apache.org/viewvc?rev=918665&view=rev
Log:
fix these warnings:
mod_isapi.c:488: warning: no previous prototype for ‘GetServerVariable’
mod_isapi.c:590: warning: no previous prototype for ‘ReadClient’
mod_isapi.c:807: warning: no previous prototype for ‘WriteClient’
mod_isapi.c:863: warning: no previous prototype for ‘ServerSupportFunction’
mod_isapi.c:1407: warning: no previous prototype for ‘isapi_handler’
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=918665&r1=918664&r2=918665&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_isapi.c Wed Mar 3 19:49:41 2010
@@ -485,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;
@@ -587,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;
@@ -804,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;
@@ -860,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;
@@ -1404,7 +1404,7 @@
*
**********************************************************/
-apr_status_t isapi_handler (request_rec *r)
+static apr_status_t isapi_handler (request_rec *r)
{
isapi_dir_conf *dconf;
apr_table_t *e;
Re: svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Fri, Mar 5, 2010 at 1:53 PM, William A. Rowe Jr. <wr...@rowe-clan.net> wrote:
> On 3/5/2010 12:16 PM, Jeff Trawick wrote:
>> On Wed, Mar 3, 2010 at 4:35 PM, William A. Rowe Jr. <wr...@rowe-clan.net> wrote:
>>> On 3/3/2010 2:03 PM, Jeff Trawick wrote:
>>>>
>>>> I guess filling in the EXTENSION_CONTROL_BLOCK with their addresses is
>>>> not the only way an app gets addressibility .../?
>>>
>>> Oh, hold up. I think you are right on this, that these aren't expected to be
>>> available in the namespace by name :)
>>
>> I agree ;)
>>
>> The first MS doc I found for one of the callbacks after your first
>> post was vague enough that I could imagine you were right, but if I
>> look at enough search hits I can find some MS writer that says exactly
>> what I want to read (which is at least a little more reassuring).
>
> If you want to recommit,
just did, a few minutes ago
> I'd preface these four with cbfnXxx or regfnXxx to make
> them look a little less suspiciously like exports. If you like I'm happy to
> recommit your patch with that change,
go for it
> since you backed it out on my foolishness :)
oh, well
Re: svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 3/5/2010 12:16 PM, Jeff Trawick wrote:
> On Wed, Mar 3, 2010 at 4:35 PM, William A. Rowe Jr. <wr...@rowe-clan.net> wrote:
>> On 3/3/2010 2:03 PM, Jeff Trawick wrote:
>>>
>>> I guess filling in the EXTENSION_CONTROL_BLOCK with their addresses is
>>> not the only way an app gets addressibility .../?
>>
>> Oh, hold up. I think you are right on this, that these aren't expected to be
>> available in the namespace by name :)
>
> I agree ;)
>
> The first MS doc I found for one of the callbacks after your first
> post was vague enough that I could imagine you were right, but if I
> look at enough search hits I can find some MS writer that says exactly
> what I want to read (which is at least a little more reassuring).
If you want to recommit, I'd preface these four with cbfnXxx or regfnXxx to make
them look a little less suspiciously like exports. If you like I'm happy to
recommit your patch with that change, since you backed it out on my foolishness :)
Re: svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Wed, Mar 3, 2010 at 4:35 PM, William A. Rowe Jr. <wr...@rowe-clan.net> wrote:
> On 3/3/2010 2:03 PM, Jeff Trawick wrote:
>>
>> I guess filling in the EXTENSION_CONTROL_BLOCK with their addresses is
>> not the only way an app gets addressibility .../?
>
> Oh, hold up. I think you are right on this, that these aren't expected to be
> available in the namespace by name :)
I agree ;)
The first MS doc I found for one of the callbacks after your first
post was vague enough that I could imagine you were right, but if I
look at enough search hits I can find some MS writer that says exactly
what I want to read (which is at least a little more reassuring).
Re: svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 3/3/2010 2:03 PM, Jeff Trawick wrote:
>
> I guess filling in the EXTENSION_CONTROL_BLOCK with their addresses is
> not the only way an app gets addressibility .../?
Oh, hold up. I think you are right on this, that these aren't expected to be
available in the namespace by name :)
Re: svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Wed, Mar 3, 2010 at 2:58 PM, William A. Rowe Jr. <wr...@rowe-clan.net> wrote:
> On 3/3/2010 1:49 PM, trawick@apache.org wrote:
>> Author: trawick
>> Date: Wed Mar 3 19:49:41 2010
>> New Revision: 918665
>>
>> URL: http://svn.apache.org/viewvc?rev=918665&view=rev
>> Log:
>> fix these warnings:
>>
>> mod_isapi.c:488: warning: no previous prototype for ‘GetServerVariable’
>> mod_isapi.c:590: warning: no previous prototype for ‘ReadClient’
>> mod_isapi.c:807: warning: no previous prototype for ‘WriteClient’
>> mod_isapi.c:863: warning: no previous prototype for ‘ServerSupportFunction’
>
> These must all be exported, that is the ISAPI API; please revert.
I guess filling in the EXTENSION_CONTROL_BLOCK with their addresses is
not the only way an app gets addressibility .../?
Re: svn commit: r918665 - /httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 3/3/2010 1:49 PM, trawick@apache.org wrote:
> Author: trawick
> Date: Wed Mar 3 19:49:41 2010
> New Revision: 918665
>
> URL: http://svn.apache.org/viewvc?rev=918665&view=rev
> Log:
> fix these warnings:
>
> mod_isapi.c:488: warning: no previous prototype for ‘GetServerVariable’
> mod_isapi.c:590: warning: no previous prototype for ‘ReadClient’
> mod_isapi.c:807: warning: no previous prototype for ‘WriteClient’
> mod_isapi.c:863: warning: no previous prototype for ‘ServerSupportFunction’
These must all be exported, that is the ISAPI API; please revert.
> mod_isapi.c:1407: warning: no previous prototype for ‘isapi_handler’
that one looks good :)