summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2003-08-08 09:51:28 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2003-08-08 09:51:28 +0000
commit5e343ad11056242b181490dc61790e65ec27351c (patch)
tree4ac20a20ea38387aa9a8628493bc36c6fbcf2552
parentde9d52c4e96c3a542b2805944426947aa8695826 (diff)
downloadphp-git-5e343ad11056242b181490dc61790e65ec27351c.tar.gz
Eliminate redundant assignment
-rw-r--r--ext/mbstring/mbstring.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 66bb33cb47..e386afee86 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -759,7 +759,7 @@ PHP_RINIT_FUNCTION(mbstring)
MBSTRG(current_language) = MBSTRG(language);
- {
+ if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
char *default_enc = NULL;
switch (MBSTRG(current_language)) {
case mbfl_no_language_uni:
@@ -788,8 +788,7 @@ PHP_RINIT_FUNCTION(mbstring)
default_enc = "ISO-8859-1";
break;
}
- MBSTRG(current_language) = MBSTRG(language);
- if (default_enc && MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
+ if (default_enc) {
zend_alter_ini_entry("mbstring.internal_encoding",
sizeof("mbstring.internal_encoding"),
default_enc, strlen(default_enc),