cvs: php-src(PHP_5_0) /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Thu, 20 Oct 2005 16:51:28 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34705@lists.php.net to get a copy of this message | ||
tony2001 Thu Oct 20 12:51:28 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/iconv iconv.c
Log:
MFH: use constants instead of their values
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.117.2.7&r2=1.117.2.8&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.117.2.7 php-src/ext/iconv/iconv.c:1.117.2.8
--- php-src/ext/iconv/iconv.c:1.117.2.7 Tue Oct 11 09:51:28 2005
+++ php-src/ext/iconv/iconv.c Thu Oct 20 12:51:27 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.117.2.7 2005/10/11 13:51:28 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.117.2.8 2005/10/20 16:51:27 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1242,7 +1242,7 @@
const char *encoded_word = NULL;
const char *spaces = NULL;
- php_iconv_enc_scheme_t enc_scheme = 0;
+ php_iconv_enc_scheme_t enc_scheme = PHP_ICONV_ENC_SCHEME_BASE64;
if (next_pos != NULL) {
*next_pos = NULL;
@@ -1701,7 +1701,7 @@
if (scan_stat == 1) {
_php_iconv_appendc(pretval, '=', cd_pl);
}
- err = 0;
+ err = PHP_ICONV_ERR_SUCCESS;
} else {
err = PHP_ICONV_ERR_MALFORMED;
goto out;
@@ -2076,7 +2076,7 @@
int charset_len;
long mode = 0;
- php_iconv_err_t err = 0;
+ php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS;
charset = ICONVG(internal_encoding);