[PHP-CVS] cvs: php-src /ext/iconv iconv.c

[Antony Dovgal]

tony2001                Thu Oct 20 12:50:45 2005 EDT

  Modified files:              
    /php-src/ext/iconv  iconv.c 
  Log:
  use constants instead of their values
  
  
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.127&r2=1.128&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.127 php-src/ext/iconv/iconv.c:1.128
--- php-src/ext/iconv/iconv.c:1.127     Tue Oct 11 09:59:18 2005
+++ php-src/ext/iconv/iconv.c   Thu Oct 20 12:50:43 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: iconv.c,v 1.127 2005/10/11 13:59:18 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.128 2005/10/20 16:50:43 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1245,7 +1245,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;
@@ -1704,7 +1704,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;
@@ -2079,7 +2079,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);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php