cvs: php4 /ext/mbstring mbstring.c

moriyoshi Tue Nov 12 17:05:19 2002 EDT Modified files: /php4/ext/mbstring mbstring.c Log: Cosmetics Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.138 php4/ext/mbstring/mbstring.c:1.139 --- php4/ext/mbstring/mbstring.c:1.138 Tue Nov 12 16:58:53 2002 +++ php4/ext/mbstring/mbstring.c Tue Nov 12 17:05:18 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.138 2002/11/12 21:58:53 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.139 2002/11/12 22:05:18 moriyoshi Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -910,17 +910,29 @@ while (p->type > 0) { if ((MBSTRG(func_overload) & p->type) == p->type && - zend_hash_find(EG(function_table), p->save_func, strlen(p->save_func)+1 , (void **)&orig) != SUCCESS) { + zend_hash_find(EG(function_table), p->save_func, + strlen(p->save_func)+1, (void **)&orig) != SUCCESS) { + zend_hash_find(EG(function_table), p->ovld_func, strlen(p->ovld_func)+1 , (void **)&func); if (zend_hash_find(EG(function_table), p->orig_func, - strlen(p->orig_func)+1, (void **)&orig) != SUCCESS) { - php_error_docref("ref.mbstring" TSRMLS_CC, E_ERROR, "mbstring couldn't find function %s.", p->orig_func); + strlen(p->orig_func)+1, (void **)&orig) != SUCCESS) { + + php_error_docref("ref.mbstring" TSRMLS_CC, E_ERROR, + "mbstring couldn't find function %s.", p->orig_func); + } else { - zend_hash_add(EG(function_table), p->save_func, strlen(p->save_func)+1, orig, sizeof(zend_function), NULL); - if (zend_hash_update(EG(function_table), p->orig_func, strlen(p->orig_func)+1, - func, sizeof(zend_function), NULL) == FAILURE){ - php_error_docref("ref.mbstring" TSRMLS_CC, E_ERROR, "mbstring couldn't replace function %s.", p->orig_func); + + zend_hash_add(EG(function_table), p->save_func, + strlen(p->save_func)+1, orig, + sizeof(zend_function), NULL); + + if (zend_hash_update(EG(function_table), p->orig_func, + strlen(p->orig_func)+1, func, sizeof(zend_function), + NULL) == FAILURE) { + + php_error_docref("ref.mbstring" TSRMLS_CC, E_ERROR, + "mbstring couldn't replace function %s.", p->orig_func); } } }