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

helly Sun Apr 7 14:09:31 2002 EDT Modified files: /php4/ext/mbstring mbfilter.c mbregex.c mbstring.c Log: -fix warnings Index: php4/ext/mbstring/mbfilter.c diff -u php4/ext/mbstring/mbfilter.c:1.20 php4/ext/mbstring/mbfilter.c:1.21 --- php4/ext/mbstring/mbfilter.c:1.20 Tue Mar 12 19:29:53 2002 +++ php4/ext/mbstring/mbfilter.c Sun Apr 7 14:09:31 2002 @@ -79,7 +79,7 @@ * */ -/* $Id: mbfilter.c,v 1.20 2002/03/13 00:29:53 yohgaki Exp $ */ +/* $Id: mbfilter.c,v 1.21 2002/04/07 18:09:31 helly Exp $ */ #include "php.h" @@ -4095,7 +4095,7 @@ static int mbfl_filt_conv_wchar_cp1252(int c, mbfl_convert_filter *filter) { - int s, n; + int s=-1, n; if (c >= 0x100) { /* look it up from the cp1252 table */ Index: php4/ext/mbstring/mbregex.c diff -u php4/ext/mbstring/mbregex.c:1.3 php4/ext/mbstring/mbregex.c:1.4 --- php4/ext/mbstring/mbregex.c:1.3 Sat Mar 23 02:32:40 2002 +++ php4/ext/mbstring/mbregex.c Sun Apr 7 14:09:31 2002 @@ -186,7 +186,9 @@ static void insert_jump _((int, char*, char*, char*)); static void store_jump_n _((char*, int, char*, unsigned)); static void insert_jump_n _((int, char*, char*, char*, unsigned)); +#if 0 static void insert_op _((int, char*, char*)); +#endif static void insert_op_2 _((int, char*, char*, int, int)); static int memcmp_translate _((unsigned char*, unsigned char*, int, const unsigned char*)); static const unsigned char* re_mbctab_get _((int)); @@ -1289,7 +1291,7 @@ register const char *p = pattern; const char *nextp; const char *pend = pattern + size; - register unsigned int c, c1; + register unsigned int c, c1=0; const char *p0; int numlen; #define ERROR_MSG_MAX_SIZE 200 Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.54 php4/ext/mbstring/mbstring.c:1.55 --- php4/ext/mbstring/mbstring.c:1.54 Fri Apr 5 20:01:41 2002 +++ php4/ext/mbstring/mbstring.c Sun Apr 7 14:09:31 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.54 2002/04/06 01:01:41 yohgaki Exp $ */ +/* $Id: mbstring.c,v 1.55 2002/04/07 18:09:31 helly Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -560,7 +560,7 @@ PHP_RINIT_FUNCTION(mbstring) { - int n, *list, *entry; + int n, *list=NULL, *entry; zend_function *func, *orig; struct mb_overload_def *p; @@ -766,7 +766,7 @@ PHP_FUNCTION(mb_http_input) { pval **arg1; - int result, retname, n, *entry; + int result=0, retname, n, *entry; char *name; retname = 1; @@ -2053,7 +2053,7 @@ enum mbfl_no_encoding from_encoding, to_encoding; mbfl_buffer_converter *convd; int size, *list; - char *output; + char *output=NULL; if (output_len) { *output_len = 0; @@ -2739,7 +2739,7 @@ { pval **arg1, **arg2, **arg3, **hash_entry; HashTable *target_hash; - int argc, i, *convmap, *mapelm, mapsize; + int argc, i, *convmap, *mapelm, mapsize=0; mbfl_string string, result, *ret; enum mbfl_no_encoding no_encoding;