cvs: php-src(PHP_4_3) /ext/iconv iconv.c php_iconv.h

From: Date: Tue, 23 Nov 2004 09:45:23 +0000
Subject: cvs: php-src(PHP_4_3) /ext/iconv iconv.c php_iconv.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-29306@lists.php.net to get a copy of this message
derick Tue Nov 23 04:45:23 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/iconv iconv.c php_iconv.h Log: - MFH: export "php_iconv_string()" http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.65.2.12&r2=1.65.2.13&ty=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.65.2.12 php-src/ext/iconv/iconv.c:1.65.2.13 --- php-src/ext/iconv/iconv.c:1.65.2.12 Sat Nov 22 08:38:46 2003 +++ php-src/ext/iconv/iconv.c Tue Nov 23 04:45:22 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.65.2.12 2003/11/22 13:38:46 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.65.2.13 2004/11/23 09:45:22 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,24 +83,11 @@ ZEND_GET_MODULE(iconv) #endif -/* {{{ typedef enum php_iconv_err_t */ -typedef enum _php_iconv_err_t { - PHP_ICONV_ERR_SUCCESS = SUCCESS, - PHP_ICONV_ERR_CONVERTER = 1, - PHP_ICONV_ERR_WRONG_CHARSET = 2, - PHP_ICONV_ERR_TOO_BIG = 3, - PHP_ICONV_ERR_ILLEGAL_SEQ = 4, - PHP_ICONV_ERR_ILLEGAL_CHAR = 5, - PHP_ICONV_ERR_UNKNOWN = 6 -} php_iconv_err_t; -/* }}} */ - #ifdef HAVE_LIBICONV #define iconv libiconv #endif /* {{{ prototypes */ -static php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, char **out, size_t *out_len, const char *in_charset, const char *out_charset); static void _php_iconv_show_error(php_iconv_err_t err, const char *in_charset, const char *out_charset TSRMLS_DC); /* }}} */ @@ -185,7 +172,7 @@ /* {{{ php_iconv_string */ -php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, +PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, char **out, size_t *out_len, const char *in_charset, const char *out_charset) { http://cvs.php.net/diff.php/php-src/ext/iconv/php_iconv.h?r1=1.12.2.5&r2=1.12.2.6&ty=u Index: php-src/ext/iconv/php_iconv.h diff -u php-src/ext/iconv/php_iconv.h:1.12.2.5 php-src/ext/iconv/php_iconv.h:1.12.2.6 --- php-src/ext/iconv/php_iconv.h:1.12.2.5 Wed Jul 30 17:57:02 2003 +++ php-src/ext/iconv/php_iconv.h Tue Nov 23 04:45:23 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Revision: 1.12.2.5 $ */ +/* $Revision: 1.12.2.6 $ */ #ifndef PHP_ICONV_H #define PHP_ICONV_H @@ -68,6 +68,20 @@ #define ICONV_OUTPUT_ENCODING "ISO-8859-1" #define ICONV_INTERNAL_ENCODING "ISO-8859-1" +/* {{{ typedef enum php_iconv_err_t */ +typedef enum _php_iconv_err_t { + PHP_ICONV_ERR_SUCCESS = SUCCESS, + PHP_ICONV_ERR_CONVERTER = 1, + PHP_ICONV_ERR_WRONG_CHARSET = 2, + PHP_ICONV_ERR_TOO_BIG = 3, + PHP_ICONV_ERR_ILLEGAL_SEQ = 4, + PHP_ICONV_ERR_ILLEGAL_CHAR = 5, + PHP_ICONV_ERR_UNKNOWN = 6 +} php_iconv_err_t; +/* }}} */ + +PHP_ICONV_API php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, char **out, size_t *out_len, const char *in_charset, const char *out_charset); + #else #define iconv_module_ptr NULL

« previous php.cvs (#29306) next »