cvs: php-src /ext/mbstring mbstring.c
| From: | Moriyoshi Koizumi | Date: | Fri, 08 Aug 2003 09:51:28 +0000 |
| Subject: | cvs: php-src /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22998@lists.php.net to get a copy of this message | ||
moriyoshi Fri Aug 8 05:51:28 2003 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
Eliminate redundant assignment
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.185 php-src/ext/mbstring/mbstring.c:1.186
--- php-src/ext/mbstring/mbstring.c:1.185 Fri Aug 8 05:40:58 2003
+++ php-src/ext/mbstring/mbstring.c Fri Aug 8 05:51:28 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.185 2003/08/08 09:40:58 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.186 2003/08/08 09:51:28 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -759,7 +759,7 @@
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 @@
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),