cvs: php4 /ext/standard file.c formatted_print.c

moriyoshi Sat Jan 11 17:17:37 2003 EDT Modified files: /php4/ext/standard file.c formatted_print.c Log: Reduced compiler warnings in ZE2 build Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.290 php4/ext/standard/file.c:1.291 --- php4/ext/standard/file.c:1.290 Thu Jan 9 18:23:32 2003 +++ php4/ext/standard/file.c Sat Jan 11 17:17:37 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.290 2003/01/09 23:23:32 iliaa Exp $ */ +/* $Id: file.c,v 1.291 2003/01/11 22:17:37 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1376,7 +1376,7 @@ ZVAL_STRINGL(return_value, buf, line_len, 0); /* resize buffer if it's much larger than the result. * Only needed if the user requested a buffer size. */ - if (argc > 1 && Z_STRLEN_P(return_value) < len / 2) { + if (argc > 1 && (int)Z_STRLEN_P(return_value) < len / 2) { Z_STRVAL_P(return_value) = erealloc(buf, line_len + 1); } } @@ -1559,7 +1559,7 @@ } convert_to_string_ex(arg2); convert_to_long_ex(arg3); - num_bytes = MIN(Z_LVAL_PP(arg3), Z_STRLEN_PP(arg2)); + num_bytes = MIN(Z_LVAL_PP(arg3), (int)Z_STRLEN_PP(arg2)); break; default: WRONG_PARAM_COUNT; Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.61 php4/ext/standard/formatted_print.c:1.62 --- php4/ext/standard/formatted_print.c:1.61 Thu Jan 9 12:29:31 2003 +++ php4/ext/standard/formatted_print.c Sat Jan 11 17:17:37 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.61 2003/01/09 17:29:31 wez Exp $ */ +/* $Id: formatted_print.c,v 1.62 2003/01/11 22:17:37 moriyoshi Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -504,7 +504,7 @@ currarg = 1; - while (inpos<Z_STRLEN_PP(args[format_offset])) { + while (inpos < (int)Z_STRLEN_PP(args[format_offset])) { int expprec = 0; PRINTF_DEBUG(("sprintf: format[%d]='%c'\n", inpos, format[inpos]));