Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:21995 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 63228 invoked by uid 1010); 24 Feb 2006 14:05:17 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 63212 invoked from network); 24 Feb 2006 14:05:17 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 24 Feb 2006 14:05:17 -0000 X-Host-Fingerprint: 192.38.9.232 gw2.emini.dk Linux 2.4/2.6 Received: from ([192.38.9.232:7497] helo=gw2.emini.dk) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id 01/BE-30574-B921FF34 for ; Fri, 24 Feb 2006 09:05:16 -0500 Received: from foxbox (IGLD-84-228-50-112.inter.net.il [84.228.50.112]) by gw2.emini.dk (Postfix) with ESMTP id 8FFC8A4966 for ; Fri, 24 Feb 2006 15:05:09 +0100 (CET) Message-ID: <047e01c6394b$56b54ad0$6402a8c0@foxbox> Reply-To: "Steph Fox" To: "internals" Date: Fri, 24 Feb 2006 16:05:15 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_047B_01C6395C.19639950" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.2180 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180 Subject: [PATCH] kill a few compiler warnings in 5_1 branch From: steph@zend.com ("Steph Fox") ------=_NextPart_000_047B_01C6395C.19639950 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit Hi all, There are 174 compiler warnings in the PHP_5_1 branch under MSVC at present, so this is an attempt to get the number down a bit (like, by around 20%) by getting rid of the simpler ones. I've separated out those I'm really not sure about (warnings_php5_unsure.txt), the rest are all simple casts. The test suite shows no changes if all three of these patches are applied, but obviously array.c and string.c are a bit close to the bone for 'probably works' so please use judgement if applying! Note: nearly half the remaining compiler warnings are due to type conversions in ext/date, which is only to be expected of a new extension, so it's not _quite_ as bad as it looks... Cheers, - Steph ------=_NextPart_000_047B_01C6395C.19639950 Content-Type: text/plain; format=flowed; name="warnings_php5_zend.txt"; reply-type=original Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="warnings_php5_zend.txt" Index: Zend/zend_execute.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/ZendEngine2/zend_execute.c,v=0A= retrieving revision 1.716.2.11=0A= diff -u -r1.716.2.11 zend_execute.c=0A= --- Zend/zend_execute.c 19 Jan 2006 07:23:32 -0000 1.716.2.11=0A= +++ Zend/zend_execute.c 24 Feb 2006 01:20:12 -0000=0A= @@ -177,8 +177,8 @@=0A= should_free->var =3D ptr;=0A= =0A= if (T->str_offset.str->type !=3D IS_STRING=0A= - || ((int)T->str_offset.offset<0)=0A= - || (T->str_offset.str->value.str.len <=3D T->str_offset.offset)) {=0A= + || ((int)T->str_offset.offset < 0)=0A= + || (T->str_offset.str->value.str.len <=3D = (int)T->str_offset.offset)) {=0A= zend_error(E_NOTICE, "Uninitialized string offset: %d", = T->str_offset.offset);=0A= ptr->value.str.val =3D STR_EMPTY_ALLOC();=0A= ptr->value.str.len =3D 0;=0A= @@ -658,7 +658,7 @@=0A= zend_error(E_WARNING, "Illegal string offset: %d", = T->str_offset.offset);=0A= break;=0A= }=0A= - if (T->str_offset.offset >=3D T->str_offset.str->value.str.len) {=0A= + if ((int)T->str_offset.offset >=3D T->str_offset.str->value.str.len) = {=0A= zend_uint i;=0A= =0A= if (T->str_offset.str->value.str.len=3D=3D0) {=0A= Index: Zend/zend_execute_API.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/ZendEngine2/zend_execute_API.c,v=0A= retrieving revision 1.331.2.13=0A= diff -u -r1.331.2.13 zend_execute_API.c=0A= --- Zend/zend_execute_API.c 22 Jan 2006 22:14:32 -0000 1.331.2.13=0A= +++ Zend/zend_execute_API.c 24 Feb 2006 01:21:21 -0000=0A= @@ -482,7 +482,7 @@=0A= continue;=0A= }=0A= =0A= - if (const_value.type =3D=3D IS_STRING && const_value.value.str.len = =3D=3D str_index_len-1 &&=0A= + if (const_value.type =3D=3D IS_STRING && const_value.value.str.len = =3D=3D (int)str_index_len-1 &&=0A= !strncmp(const_value.value.str.val, str_index, str_index_len)) {=0A= /* constant value is the same as its name */=0A= zval_dtor(&const_value);=0A= Index: Zend/zend_interfaces.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/ZendEngine2/zend_interfaces.c,v=0A= retrieving revision 1.33.2.2=0A= diff -u -r1.33.2.2 zend_interfaces.c=0A= --- Zend/zend_interfaces.c 4 Jan 2006 23:53:04 -0000 1.33.2.2=0A= +++ Zend/zend_interfaces.c 24 Feb 2006 01:21:21 -0000=0A= @@ -336,7 +336,7 @@=0A= } else if (class_type->get_iterator !=3D = zend_user_it_get_new_iterator) {=0A= /* c-level get_iterator cannot be changed (exception being only = Traversable is implmented) */=0A= if (class_type->num_interfaces) {=0A= - for (i =3D 0; i < class_type->num_interfaces; i++) {=0A= + for (i =3D 0; i < (int)class_type->num_interfaces; i++) {=0A= if (class_type->interfaces[i] =3D=3D zend_ce_iterator) {=0A= return FAILURE;=0A= }=0A= Index: Zend/zend_vm_execute.h=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/ZendEngine2/zend_vm_execute.h,v=0A= retrieving revision 1.62.2.24=0A= diff -u -r1.62.2.24 zend_vm_execute.h=0A= --- Zend/zend_vm_execute.h 6 Feb 2006 11:45:56 -0000 1.62.2.24=0A= +++ Zend/zend_vm_execute.h 24 Feb 2006 01:27:44 -0000=0A= @@ -7553,7 +7553,7 @@=0A= HashTable *fe_ht;=0A= zend_object_iterator *iter =3D NULL;=0A= int key_type;=0A= - zend_bool use_key =3D opline->extended_value & ZEND_FE_FETCH_WITH_KEY;=0A= + zend_bool use_key =3D (zend_bool)opline->extended_value & = ZEND_FE_FETCH_WITH_KEY;=0A= =0A= PZVAL_LOCK(array);=0A= =0A= ------=_NextPart_000_047B_01C6395C.19639950 Content-Type: text/plain; format=flowed; name="warnings_php5.txt"; reply-type=original Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="warnings_php5.txt" Index: ext/com_dotnet/com_saproxy.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/com_dotnet/com_saproxy.c,v=0A= retrieving revision 1.15.2.2=0A= diff -u -r1.15.2.2 com_saproxy.c=0A= --- ext/com_dotnet/com_saproxy.c 1 Jan 2006 12:50:00 -0000 1.15.2.2=0A= +++ ext/com_dotnet/com_saproxy.c 24 Feb 2006 00:34:20 -0000=0A= @@ -145,7 +145,7 @@=0A= sa =3D V_ARRAY(&proxy->obj->v);=0A= dims =3D SafeArrayGetDim(sa);=0A= =0A= - if (proxy->dimensions >=3D dims) {=0A= + if (proxy->dimensions >=3D (int)dims) {=0A= /* too many dimensions */=0A= php_com_throw_exception(E_INVALIDARG, "too many dimensions!" = TSRMLS_CC);=0A= return return_value;=0A= @@ -160,7 +160,7 @@=0A= return return_value;=0A= }=0A= =0A= - if (dims - 1 =3D=3D proxy->dimensions) {=0A= + if ((int)dims - 1 =3D=3D proxy->dimensions) {=0A= LONG *indices;=0A= VARTYPE vt;=0A= VARIANT v;=0A= @@ -171,7 +171,7 @@=0A= indices =3D safe_emalloc(dims, sizeof(LONG), 0);=0A= =0A= /* copy indices from proxy */=0A= - for (i =3D 0; i < dims; i++) {=0A= + for (i =3D 0; i < (int)dims; i++) {=0A= convert_to_long(proxy->indices[i]);=0A= indices[i] =3D Z_LVAL_P(proxy->indices[i]);=0A= }=0A= @@ -246,7 +246,7 @@=0A= dims =3D SafeArrayGetDim(V_ARRAY(&proxy->obj->v));=0A= indices =3D safe_emalloc(dims, sizeof(LONG), 0);=0A= /* copy indices from proxy */=0A= - for (i =3D 0; i < dims; i++) {=0A= + for (i =3D 0; i < (int)dims; i++) {=0A= convert_to_long(proxy->indices[i]);=0A= indices[i] =3D Z_LVAL_P(proxy->indices[i]);=0A= }=0A= Index: ext/reflection/php_reflection.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/reflection/php_reflection.c,v=0A= retrieving revision 1.164.2.25=0A= diff -u -r1.164.2.25 php_reflection.c=0A= --- ext/reflection/php_reflection.c 20 Feb 2006 23:33:32 -0000 1.164.2.25=0A= +++ ext/reflection/php_reflection.c 24 Feb 2006 00:38:06 -0000=0A= @@ -553,7 +553,7 @@=0A= ++offset;=0A= while (op < end) {=0A= if ((op->opcode =3D=3D ZEND_RECV || op->opcode =3D=3D ZEND_RECV_INIT) = &&=0A= - op->op1.u.constant.value.lval =3D=3D offset) {=0A= + op->op1.u.constant.value.lval =3D=3D (int)offset) {=0A= return op;=0A= }=0A= ++op;=0A= Index: ext/standard/dir.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/dir.c,v=0A= retrieving revision 1.147.2.2=0A= diff -u -r1.147.2.2 dir.c=0A= --- ext/standard/dir.c 1 Jan 2006 12:50:14 -0000 1.147.2.2=0A= +++ ext/standard/dir.c 24 Feb 2006 00:40:19 -0000=0A= @@ -370,7 +370,7 @@=0A= int pattern_len;=0A= long flags =3D 0;=0A= glob_t globbuf;=0A= - unsigned int n;=0A= + int n;=0A= int ret;=0A= =0A= if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern, = &pattern_len, &flags) =3D=3D FAILURE) =0A= Index: ext/standard/exec.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/exec.c,v=0A= retrieving revision 1.113.2.2=0A= diff -u -r1.113.2.2 exec.c=0A= --- ext/standard/exec.c 1 Jan 2006 12:50:14 -0000 1.113.2.2=0A= +++ ext/standard/exec.c 24 Feb 2006 02:08:25 -0000=0A= @@ -135,7 +135,7 @@=0A= /* strip trailing whitespaces */ =0A= l =3D bufl;=0A= while (l-- && isspace(((unsigned char *)buf)[l]));=0A= - if (l !=3D (bufl - 1)) {=0A= + if (l !=3D (int)(bufl - 1)) {=0A= bufl =3D l + 1;=0A= buf[bufl] =3D '\0';=0A= }=0A= @@ -148,7 +148,7 @@=0A= if (type !=3D 2) {=0A= l =3D bufl;=0A= while (l-- && isspace(((unsigned char *)buf)[l]));=0A= - if (l !=3D (bufl - 1)) {=0A= + if (l !=3D (int)(bufl - 1)) {=0A= bufl =3D l + 1;=0A= buf[bufl] =3D '\0';=0A= }=0A= Index: ext/standard/pack.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/pack.c,v=0A= retrieving revision 1.57.2.4=0A= diff -u -r1.57.2.4 pack.c=0A= --- ext/standard/pack.c 26 Jan 2006 15:45:33 -0000 1.57.2.4=0A= +++ ext/standard/pack.c 24 Feb 2006 00:43:01 -0000=0A= @@ -55,7 +55,7 @@=0A= #endif=0A= =0A= #define INC_OUTPUTPOS(a,b) \=0A= - if ((a) < 0 || ((INT_MAX - outputpos)/(b)) < (a)) { \=0A= + if ((a) < 0 || ((INT_MAX - outputpos)/((int)b)) < (a)) { \=0A= php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: integer = overflow in format string", code); \=0A= RETURN_FALSE; \=0A= } \=0A= Index: ext/standard/reg.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/reg.c,v=0A= retrieving revision 1.82.2.2=0A= diff -u -r1.82.2.2 reg.c=0A= --- ext/standard/reg.c 1 Jan 2006 12:50:15 -0000 1.82.2.2=0A= +++ ext/standard/reg.c 24 Feb 2006 00:44:18 -0000=0A= @@ -355,7 +355,7 @@=0A= new_l =3D strlen(buf) + subs[0].rm_so; /* part before the match */=0A= walk =3D replace;=0A= while (*walk) {=0A= - if ('\\' =3D=3D *walk && isdigit((unsigned char)walk[1]) && = ((unsigned char)walk[1]) - '0' <=3D re.re_nsub) {=0A= + if ('\\' =3D=3D *walk && isdigit((unsigned char)walk[1]) && = ((unsigned char)walk[1]) - '0' <=3D (int)re.re_nsub) {=0A= if (subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > = -1) {=0A= new_l +=3D subs[walk[1] - '0'].rm_eo - subs[walk[1] - '0'].rm_so;=0A= } =0A= Index: ext/standard/user_filters.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/user_filters.c,v=0A= retrieving revision 1.31.2.1=0A= diff -u -r1.31.2.1 user_filters.c=0A= --- ext/standard/user_filters.c 1 Jan 2006 12:50:15 -0000 1.31.2.1=0A= +++ ext/standard/user_filters.c 24 Feb 2006 00:49:22 -0000=0A= @@ -406,7 +406,7 @@=0A= if (!bucket->own_buf) {=0A= bucket =3D php_stream_bucket_make_writeable(bucket TSRMLS_CC);=0A= }=0A= - if (bucket->buflen !=3D Z_STRLEN_PP(pzdata)) {=0A= + if ((int)bucket->buflen !=3D Z_STRLEN_PP(pzdata)) {=0A= bucket->buf =3D perealloc(bucket->buf, Z_STRLEN_PP(pzdata), = bucket->is_persistent);=0A= bucket->buflen =3D Z_STRLEN_PP(pzdata);=0A= }=0A= Index: main/main.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/main/main.c,v=0A= retrieving revision 1.640.2.15=0A= diff -u -r1.640.2.15 main.c=0A= --- main/main.c 3 Feb 2006 09:31:59 -0000 1.640.2.15=0A= +++ main/main.c 24 Feb 2006 00:51:11 -0000=0A= @@ -659,7 +659,7 @@=0A= * be NULL if PG(last_error_message) is not NULL */=0A= if (strcmp(PG(last_error_message), buffer)=0A= || (!PG(ignore_repeated_source)=0A= - && ((PG(last_error_lineno) !=3D error_lineno)=0A= + && ((PG(last_error_lineno) !=3D (int)error_lineno)=0A= || strcmp(PG(last_error_file), error_filename)))) {=0A= display =3D 1;=0A= } else {=0A= Index: main/streams/filter.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/main/streams/filter.c,v=0A= retrieving revision 1.17.2.2=0A= diff -u -r1.17.2.2 filter.c=0A= --- main/streams/filter.c 10 Jan 2006 16:14:16 -0000 1.17.2.2=0A= +++ main/streams/filter.c 24 Feb 2006 01:46:13 -0000=0A= @@ -351,7 +351,7 @@=0A= php_stream_bucket_append(brig_inp, bucket TSRMLS_CC);=0A= status =3D filter->fops->filter(stream, filter, brig_inp, brig_outp, = &consumed, PSFS_FLAG_NORMAL TSRMLS_CC);=0A= =0A= - if (stream->readpos + consumed > stream->writepos || consumed < 0) {=0A= + if (stream->readpos + consumed > (uint)stream->writepos || consumed < = 0) {=0A= /* No behaving filter should cause this. */=0A= status =3D PSFS_ERR_FATAL;=0A= }=0A= Index: sapi/cgi/fastcgi.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/sapi/cgi/fastcgi.c,v=0A= retrieving revision 1.4.2.4=0A= diff -u -r1.4.2.4 fastcgi.c=0A= --- sapi/cgi/fastcgi.c 4 Feb 2006 23:54:21 -0000 1.4.2.4=0A= +++ sapi/cgi/fastcgi.c 24 Feb 2006 00:52:38 -0000=0A= @@ -531,7 +531,7 @@=0A= }=0A= len =3D p - buf - sizeof(fcgi_header);=0A= len +=3D fcgi_make_header((fcgi_header*)buf, FCGI_GET_VALUES_RESULT, = 0, len);=0A= - if (safe_write(req, buf, sizeof(fcgi_header)+len) !=3D = sizeof(fcgi_header)+len) {=0A= + if (safe_write(req, buf, sizeof(fcgi_header)+len) !=3D = (int)sizeof(fcgi_header)+len) {=0A= return 0;=0A= }=0A= return 0;=0A= Index: win32/select.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/win32/select.c,v=0A= retrieving revision 1.10.2.1=0A= diff -u -r1.10.2.1 select.c=0A= --- win32/select.c 1 Jan 2006 12:50:20 -0000 1.10.2.1=0A= +++ win32/select.c 24 Feb 2006 02:07:30 -0000=0A= @@ -67,13 +67,13 @@=0A= if ((DWORD)handles[n_handles] =3D=3D 0xffffffff) {=0A= /* socket */=0A= if (SAFE_FD_ISSET(i, rfds)) {=0A= - FD_SET(i, &sock_read);=0A= + FD_SET((uint)i, &sock_read);=0A= }=0A= if (SAFE_FD_ISSET(i, wfds)) {=0A= - FD_SET(i, &sock_write);=0A= + FD_SET((uint)i, &sock_write);=0A= }=0A= if (SAFE_FD_ISSET(i, efds)) {=0A= - FD_SET(i, &sock_except);=0A= + FD_SET((uint)i, &sock_except);=0A= }=0A= if (i > sock_max_fd) {=0A= sock_max_fd =3D i;=0A= @@ -136,13 +136,13 @@=0A= for (i =3D 0; i < n_handles; i++) {=0A= if (WAIT_OBJECT_0 =3D=3D WaitForSingleObject(handles[i], 0)) {=0A= if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {=0A= - FD_SET(handle_slot_to_fd[i], &aread);=0A= + FD_SET((uint)handle_slot_to_fd[i], &aread);=0A= }=0A= if (SAFE_FD_ISSET(handle_slot_to_fd[i], wfds)) {=0A= - FD_SET(handle_slot_to_fd[i], &awrite);=0A= + FD_SET((uint)handle_slot_to_fd[i], &awrite);=0A= }=0A= if (SAFE_FD_ISSET(handle_slot_to_fd[i], efds)) {=0A= - FD_SET(handle_slot_to_fd[i], &aexcept);=0A= + FD_SET((uint)handle_slot_to_fd[i], &aexcept);=0A= }=0A= retcode++;=0A= }=0A= ------=_NextPart_000_047B_01C6395C.19639950 Content-Type: text/plain; format=flowed; name="warnings_php5_unsure.txt"; reply-type=original Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="warnings_php5_unsure.txt" Index: ext/com_dotnet/com_iterator.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/com_dotnet/com_iterator.c,v=0A= retrieving revision 1.9.2.2=0A= diff -u -r1.9.2.2 com_iterator.c=0A= --- ext/com_dotnet/com_iterator.c 7 Feb 2006 11:50:54 -0000 1.9.2.2=0A= +++ ext/com_dotnet/com_iterator.c 24 Feb 2006 00:31:53 -0000=0A= @@ -32,7 +32,7 @@=0A= struct php_com_iterator {=0A= zend_object_iterator iter;=0A= IEnumVARIANT *ev;=0A= - ulong key;=0A= + long key;=0A= VARIANT v; /* cached element */=0A= int code_page;=0A= VARIANT safe_array;=0A= @@ -112,7 +112,7 @@=0A= } else {=0A= /* safe array */=0A= if (I->key >=3D I->sa_max) {=0A= - I->key =3D (ulong)-1;=0A= + I->key =3D -1;=0A= return FAILURE;=0A= }=0A= I->key++;=0A= Index: ext/iconv/iconv.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/iconv/iconv.c,v=0A= retrieving revision 1.124.2.5=0A= diff -u -r1.124.2.5 iconv.c=0A= --- ext/iconv/iconv.c 1 Jan 2006 12:50:08 -0000 1.124.2.5=0A= +++ ext/iconv/iconv.c 24 Feb 2006 00:37:08 -0000=0A= @@ -583,7 +583,7 @@=0A= size_t out_left;=0A= =0A= unsigned int cnt;=0A= - unsigned int total_len;=0A= + int total_len;=0A= =0A= err =3D _php_iconv_strlen(&total_len, str, nbytes, enc);=0A= if (err !=3D PHP_ICONV_ERR_SUCCESS) {=0A= Index: ext/standard/array.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/array.c,v=0A= retrieving revision 1.308.2.17=0A= diff -u -r1.308.2.17 array.c=0A= --- ext/standard/array.c 7 Feb 2006 17:54:24 -0000 1.308.2.17=0A= +++ ext/standard/array.c 24 Feb 2006 12:41:17 -0000=0A= @@ -1810,14 +1810,14 @@=0A= /* Clamp the offset.. */=0A= if (offset > num_in)=0A= offset =3D num_in;=0A= - else if (offset < 0 && (offset=3Dnum_in+offset) < 0)=0A= + else if (offset < 0 && (offset =3D num_in + offset) < 0)=0A= offset =3D 0;=0A= =0A= /* ..and the length */=0A= if (length < 0) {=0A= - length =3D num_in-offset+length;=0A= - } else if (((unsigned) offset + (unsigned) length) > num_in) {=0A= - length =3D num_in-offset;=0A= + length =3D num_in - offset + length;=0A= + } else if (((unsigned)offset + (unsigned)length) > (unsigned)num_in) {=0A= + length =3D num_in - offset;=0A= }=0A= =0A= /* Create and initialize output hash */=0A= @@ -2204,14 +2204,14 @@=0A= /* Clamp the offset.. */=0A= if (offset_val > num_in)=0A= return;=0A= - else if (offset_val < 0 && (offset_val=3Dnum_in+offset_val) < 0)=0A= + else if (offset_val < 0 && (offset_val =3D num_in + offset_val) < 0)=0A= offset_val =3D 0;=0A= =0A= /* ..and the length */=0A= if (length_val < 0) {=0A= - length_val =3D num_in-offset_val+length_val;=0A= - } else if (((unsigned) offset_val + (unsigned) length_val) > num_in) {=0A= - length_val =3D num_in-offset_val;=0A= + length_val =3D num_in - offset_val + length_val;=0A= + } else if (((unsigned)offset_val + (unsigned)length_val) > = (unsigned)num_in) {=0A= + length_val =3D num_in - offset_val;=0A= }=0A= =0A= if (length_val =3D=3D 0)=0A= Index: ext/standard/string.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/string.c,v=0A= retrieving revision 1.445.2.8=0A= diff -u -r1.445.2.8 string.c=0A= --- ext/standard/string.c 29 Jan 2006 17:54:45 -0000 1.445.2.8=0A= +++ ext/standard/string.c 24 Feb 2006 13:25:22 -0000=0A= @@ -237,7 +237,7 @@=0A= }=0A= }=0A= =0A= - if (((unsigned) start + (unsigned) len) > len1) {=0A= + if ((start + len) > len1) {=0A= len =3D len1 - start;=0A= }=0A= =0A= @@ -1166,7 +1166,7 @@=0A= if (state =3D=3D 1) {=0A= cend =3D c;=0A= }=0A= - if (suffix !=3D NULL && sufflen < (cend - comp) &&=0A= + if (suffix !=3D NULL && sufflen < (uint)(cend - comp) &&=0A= memcmp(cend - sufflen, suffix, sufflen) =3D=3D 0) {=0A= cend -=3D sufflen;=0A= }=0A= @@ -1983,7 +1983,7 @@=0A= RETURN_FALSE;=0A= }=0A= =0A= - if (((unsigned) f + (unsigned) l) > Z_STRLEN_PP(str)) {=0A= + if ((f + l) > Z_STRLEN_PP(str)) {=0A= l =3D Z_STRLEN_PP(str) - f;=0A= }=0A= =0A= @@ -2080,7 +2080,7 @@=0A= }=0A= }=0A= =0A= - if (((unsigned) f + (unsigned) l) > Z_STRLEN_PP(str)) {=0A= + if ((f + l) > Z_STRLEN_PP(str)) {=0A= l =3D Z_STRLEN_PP(str) - f;=0A= }=0A= if (Z_TYPE_PP(repl) =3D=3D IS_ARRAY) {=0A= @@ -2176,7 +2176,7 @@=0A= }=0A= }=0A= =0A= - if (((unsigned) f + (unsigned) l) > Z_STRLEN_PP(tmp_str)) {=0A= + if ((f + l) > Z_STRLEN_PP(tmp_str)) {=0A= l =3D Z_STRLEN_PP(tmp_str) - f;=0A= }=0A= =0A= ------=_NextPart_000_047B_01C6395C.19639950--