cvs: php4 /ext/mbstring mbstring.c

hirokawa Sun Apr 21 18:06:56 2002 EDT Modified files: /php4/ext/mbstring mbstring.c Log: small performance improvement when pass is selected as input encoding. Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.62 php4/ext/mbstring/mbstring.c:1.63 --- php4/ext/mbstring/mbstring.c:1.62 Sun Apr 14 04:18:55 2002 +++ php4/ext/mbstring/mbstring.c Sun Apr 21 18:06:55 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.62 2002/04/14 08:18:55 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.63 2002/04/21 22:06:55 hirokawa Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -1060,8 +1060,8 @@ int n, num, val_len, *len_list, *elist, elistsz; enum mbfl_no_encoding from_encoding, to_encoding; mbfl_string string, resvar, resval; - mbfl_encoding_detector *identd; - mbfl_buffer_converter *convd; + mbfl_encoding_detector *identd = NULL; + mbfl_buffer_converter *convd = NULL; mbfl_string_init_set(&string, MBSTRG(current_language), MBSTRG(current_internal_encoding)); mbfl_string_init_set(&resvar, MBSTRG(current_language), MBSTRG(current_internal_encoding)); @@ -1174,8 +1174,10 @@ n++; /* add variable to symbol table */ php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC); - mbfl_string_clear(&resvar); - mbfl_string_clear(&resval); + if (convd != NULL){ + mbfl_string_clear(&resvar); + mbfl_string_clear(&resval); + } } MBSTRG(http_input_identify) = from_encoding;