cvs: php4 /ext/mbstring mbregex.c mbstring.c

helly Sun Aug 4 14:59:18 2002 EDT Modified files: /php4/ext/mbstring mbregex.c mbstring.c Log: -Fix warnings (fixed all?) Index: php4/ext/mbstring/mbregex.c diff -u php4/ext/mbstring/mbregex.c:1.6 php4/ext/mbstring/mbregex.c:1.7 --- php4/ext/mbstring/mbregex.c:1.6 Fri Aug 2 06:22:31 2002 +++ php4/ext/mbstring/mbregex.c Sun Aug 4 14:59:17 2002 @@ -647,7 +647,7 @@ /* Make sure we have at least N more bytes of space in buffer. */ #define GET_BUFFER_SPACE(n) \ do { \ - while (b - bufp->buffer + (n) >= bufp->allocated) \ + while (b - bufp->buffer + (size_t)(n) >= (size_t)bufp->allocated) \ EXTEND_BUFFER; \ } while (0) @@ -2401,7 +2401,7 @@ GET_UNSIGNED_NUMBER(c1); if (!ISDIGIT(c)) PATUNFETCH; - if (9 < c1 && c1 >= regnum) { + if (9 < c1 && c1 >= (unsigned int)regnum) { /* need to get octal */ c = scan_oct(p0, 3, &numlen) & 0xff; p = p0 + numlen; @@ -3881,7 +3881,7 @@ register unsigned char *d2, *dend2; /* Check if there's corresponding group */ - if (regno >= num_regs) goto fail; + if (regno >= (int)num_regs) goto fail; /* Check if corresponding group is still open */ if (IS_ACTIVE(reg_info[regno])) goto fail; Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.88 php4/ext/mbstring/mbstring.c:1.89 --- php4/ext/mbstring/mbstring.c:1.88 Sun Aug 4 10:10:58 2002 +++ php4/ext/mbstring/mbstring.c Sun Aug 4 14:59:17 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.88 2002/08/04 14:10:58 helly Exp $ */ +/* $Id: mbstring.c,v 1.89 2002/08/04 18:59:17 helly Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -138,7 +138,7 @@ static const unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; #endif -static const sapi_post_entry mbstr_post_entries[] = { +static sapi_post_entry mbstr_post_entries[] = { { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1, sapi_read_standard_form_data, php_mbstr_post_handler }, { MULTIPART_CONTENT_TYPE, sizeof(MULTIPART_CONTENT_TYPE)-1, NULL, rfc1867_post_handler }, { NULL, 0, NULL, NULL } @@ -3371,7 +3371,7 @@ } /* }}} */ -PHPAPI int mbstr_encoding_translation(TSRMLS_D) +PHPAPI int mbstr_encoding_translation(TSRMLS_D) { return MBSTRG(encoding_translation); }