You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/18 04:46:50 UTC
svn commit: r605073 - in /httpd/httpd/branches/2.2.x:
modules/http/http_etag.c support/ab.c
Author: wrowe
Date: Mon Dec 17 19:46:48 2007
New Revision: 605073
URL: http://svn.apache.org/viewvc?rev=605073&view=rev
Log:
Two type mismatch fixes previously committed to trunk\
and forgotten from backports
Modified:
httpd/httpd/branches/2.2.x/modules/http/http_etag.c
httpd/httpd/branches/2.2.x/support/ab.c
Modified: httpd/httpd/branches/2.2.x/modules/http/http_etag.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/http_etag.c?rev=605073&r1=605072&r2=605073&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/http_etag.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_etag.c Mon Dec 17 19:46:48 2007
@@ -37,7 +37,8 @@
int printing = 0;
int shift = sizeof(apr_uint64_t) * 8 - 4;
do {
- unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf);
+ unsigned short next_digit = (unsigned short)
+ ((u >> shift) & (apr_uint64_t)0xf);
if (next_digit) {
*next++ = HEX_DIGITS[next_digit];
printing = 1;
Modified: httpd/httpd/branches/2.2.x/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/ab.c?rev=605073&r1=605072&r2=605073&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/ab.c (original)
+++ httpd/httpd/branches/2.2.x/support/ab.c Mon Dec 17 19:46:48 2007
@@ -1147,7 +1147,7 @@
SSL_set_connect_state(c->ssl);
if (verbosity >= 4) {
BIO_set_callback(bio, ssl_print_cb);
- BIO_set_callback_arg(bio, bio_err);
+ BIO_set_callback_arg(bio, (void *)bio_err);
}
} else {
c->ssl = NULL;
Re: httpd/branches/2.2.x/ noise
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
William A. Rowe, Jr. wrote:
> Remaining noise after these two are applied to trunk are listed below.
> It's looking awfully sloppy - and prone to optimization bugs.
>
>> URL: http://svn.apache.org/viewvc?rev=605073&view=rev
>> Log:
>> Two type mismatch fixes previously committed to trunk\
>> and forgotten from backports
sorry - trimmed the citation on this one, we already discussed on list.
--- httpd/httpd/branches/2.2.x/modules/http/http_etag.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_etag.c Mon Dec 17 19:46:48 2007
>> @@ -37,7 +37,8 @@
>> int printing = 0;
>> int shift = sizeof(apr_uint64_t) * 8 - 4;
>> do {
>> - unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf);
>> + unsigned short next_digit = (unsigned short)
>> + ((u >> shift) & (apr_uint64_t)0xf);
and sorry - ignore this one, it's a side effect of an OS upgrade here,
time to rebuild libaprutil.
> /usr/bin/ld: warning: libexpat.so.0, needed by
> /usr/local/apr1.2/lib/libaprutil-1.so, may conflict with libexpat.so.1
Re: httpd/branches/2.2.x/ noise
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
William A. Rowe, Jr. wrote:
> Remaining noise after these two are applied to trunk are listed below.
> It's looking awfully sloppy - and prone to optimization bugs.
>
>> URL: http://svn.apache.org/viewvc?rev=605073&view=rev
>> Log:
>> Two type mismatch fixes previously committed to trunk\
>> and forgotten from backports
sorry - trimmed the citation on this one, we already discussed on list.
--- httpd/httpd/branches/2.2.x/modules/http/http_etag.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_etag.c Mon Dec 17 19:46:48 2007
>> @@ -37,7 +37,8 @@
>> int printing = 0;
>> int shift = sizeof(apr_uint64_t) * 8 - 4;
>> do {
>> - unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf);
>> + unsigned short next_digit = (unsigned short)
>> + ((u >> shift) & (apr_uint64_t)0xf);
and sorry - ignore this one, it's a side effect of an OS upgrade here,
time to rebuild libaprutil.
> /usr/bin/ld: warning: libexpat.so.0, needed by
> /usr/local/apr1.2/lib/libaprutil-1.so, may conflict with libexpat.so.1
httpd/branches/2.2.x/ noise
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Remaining noise after these two are applied to trunk are listed below.
It's looking awfully sloppy - and prone to optimization bugs.
> URL: http://svn.apache.org/viewvc?rev=605073&view=rev
> Log:
> Two type mismatch fixes previously committed to trunk\
> and forgotten from backports
> @@ -37,7 +37,8 @@
> int printing = 0;
> int shift = sizeof(apr_uint64_t) * 8 - 4;
> do {
> - unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf);
> + unsigned short next_digit = (unsigned short)
> + ((u >> shift) & (apr_uint64_t)0xf);
> --- httpd/httpd/branches/2.2.x/support/ab.c (original)
> +++ httpd/httpd/branches/2.2.x/support/ab.c Mon Dec 17 19:46:48 2007
> @@ -1147,7 +1147,7 @@
> SSL_set_connect_state(c->ssl);
> if (verbosity >= 4) {
> BIO_set_callback(bio, ssl_print_cb);
> - BIO_set_callback_arg(bio, bio_err);
> + BIO_set_callback_arg(bio, (void *)bio_err);
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c: In function 'queue_info_cleanup':
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c:46: warning: dereferencing type-punned pointer will break strict-aliasing rules
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c: In function 'ap_queue_info_set_idle':
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c:98: warning: dereferencing type-punned pointer will break strict-aliasing rules
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c: In function 'ap_queue_info_wait_for_idler':
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c:192: warning: dereferencing type-punned pointer will break strict-aliasing rules
/usr/bin/ld: warning: libexpat.so.0, needed by /usr/local/apr1.2/lib/libaprutil-1.so, may conflict with libexpat.so.1
/local0/asf/build/httpd-2.2/modules/proxy/proxy_util.c: In function 'ap_proxy_initialize_worker':
/local0/asf/build/httpd-2.2/modules/proxy/proxy_util.c:1777: warning: dereferencing type-punned pointer will break strict-aliasing rules
/local0/asf/build/httpd-2.2/modules/proxy/mod_proxy_ajp.c: In function 'ap_proxy_ajp_request':
/local0/asf/build/httpd-2.2/modules/proxy/mod_proxy_ajp.c:243: warning: dereferencing type-punned pointer will break strict-aliasing
rules
/local0/asf/build/httpd-2.2/modules/proxy/mod_proxy_ajp.c:418: warning: dereferencing type-punned pointer will break strict-aliasing
rules
/local0/asf/build/httpd-2.2/modules/ssl/ssl_engine_init.c: In function 'ssl_init_FindCAList':
/local0/asf/build/httpd-2.2/modules/ssl/ssl_engine_init.c:1166: warning: value computed is not used
/local0/asf/build/httpd-2.2/modules/generators/mod_cgid.c: In function 'cgid_start':
/local0/asf/build/httpd-2.2/modules/generators/mod_cgid.c:617: warning: 'env' may be used uninitialized in this function
/local0/asf/build/httpd-2.2/modules/generators/mod_cgid.c:616: warning: 'argv0' may be used uninitialized in this function
httpd/branches/2.2.x/ noise
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Remaining noise after these two are applied to trunk are listed below.
It's looking awfully sloppy - and prone to optimization bugs.
> URL: http://svn.apache.org/viewvc?rev=605073&view=rev
> Log:
> Two type mismatch fixes previously committed to trunk\
> and forgotten from backports
> @@ -37,7 +37,8 @@
> int printing = 0;
> int shift = sizeof(apr_uint64_t) * 8 - 4;
> do {
> - unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf);
> + unsigned short next_digit = (unsigned short)
> + ((u >> shift) & (apr_uint64_t)0xf);
> --- httpd/httpd/branches/2.2.x/support/ab.c (original)
> +++ httpd/httpd/branches/2.2.x/support/ab.c Mon Dec 17 19:46:48 2007
> @@ -1147,7 +1147,7 @@
> SSL_set_connect_state(c->ssl);
> if (verbosity >= 4) {
> BIO_set_callback(bio, ssl_print_cb);
> - BIO_set_callback_arg(bio, bio_err);
> + BIO_set_callback_arg(bio, (void *)bio_err);
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c: In function 'queue_info_cleanup':
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c:46: warning: dereferencing type-punned pointer will break strict-aliasing rules
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c: In function 'ap_queue_info_set_idle':
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c:98: warning: dereferencing type-punned pointer will break strict-aliasing rules
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c: In function 'ap_queue_info_wait_for_idler':
/local0/asf/build/httpd-2.2/server/mpm/worker/fdqueue.c:192: warning: dereferencing type-punned pointer will break strict-aliasing rules
/usr/bin/ld: warning: libexpat.so.0, needed by /usr/local/apr1.2/lib/libaprutil-1.so, may conflict with libexpat.so.1
/local0/asf/build/httpd-2.2/modules/proxy/proxy_util.c: In function 'ap_proxy_initialize_worker':
/local0/asf/build/httpd-2.2/modules/proxy/proxy_util.c:1777: warning: dereferencing type-punned pointer will break strict-aliasing rules
/local0/asf/build/httpd-2.2/modules/proxy/mod_proxy_ajp.c: In function 'ap_proxy_ajp_request':
/local0/asf/build/httpd-2.2/modules/proxy/mod_proxy_ajp.c:243: warning: dereferencing type-punned pointer will break strict-aliasing
rules
/local0/asf/build/httpd-2.2/modules/proxy/mod_proxy_ajp.c:418: warning: dereferencing type-punned pointer will break strict-aliasing
rules
/local0/asf/build/httpd-2.2/modules/ssl/ssl_engine_init.c: In function 'ssl_init_FindCAList':
/local0/asf/build/httpd-2.2/modules/ssl/ssl_engine_init.c:1166: warning: value computed is not used
/local0/asf/build/httpd-2.2/modules/generators/mod_cgid.c: In function 'cgid_start':
/local0/asf/build/httpd-2.2/modules/generators/mod_cgid.c:617: warning: 'env' may be used uninitialized in this function
/local0/asf/build/httpd-2.2/modules/generators/mod_cgid.c:616: warning: 'argv0' may be used uninitialized in this function