From 16cf26ee183b59564c55a4809c7d946b011f4283 Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Tue, 12 Nov 2002 22:05:18 +0000 Subject: [PATCH] Cosmetics --- ext/mbstring/mbstring.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 83d39eadc9..b6f14373bc 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -910,17 +910,29 @@ PHP_RINIT_FUNCTION(mbstring) 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); } } } -- 2.50.1