derick Tue Nov 23 04:44:54 2004 EDT
Modified files:
/php-src/ext/iconv iconv.c php_iconv.h
Log:
- Export "php_iconv_string()".
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.120&r2=1.121&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.120 php-src/ext/iconv/iconv.c:1.121
--- php-src/ext/iconv/iconv.c:1.120 Fri Aug 13 10:52:27 2004
+++ php-src/ext/iconv/iconv.c Tue Nov 23 04:44:54 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.120 2004/08/13 14:52:27 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.121 2004/11/23 09:44:54 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -106,20 +106,6 @@
#define iconv libiconv
#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_MALFORMED = 7,
- PHP_ICONV_ERR_ALLOC = 8
-} php_iconv_err_t;
-/* }}} */
-
/* {{{ typedef enum php_iconv_enc_scheme_t */
typedef enum _php_iconv_enc_scheme_t {
PHP_ICONV_ENC_SCHEME_BASE64,
@@ -134,8 +120,6 @@
static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t
l, iconv_t cd);
static php_iconv_err_t _php_iconv_appendc(smart_str *d, const char c, iconv_t
cd);
-static php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, char
**out, size_t *out_len, const char *out_charset, const char *in_charset);
-
static void _php_iconv_show_error(php_iconv_err_t err, const char
*out_charset, const char *in_charset TSRMLS_DC);
static php_iconv_err_t _php_iconv_strlen(unsigned int *pretval, const char
*str, size_t nbytes, const char *enc);
@@ -335,7 +319,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
*out_charset, const char *in_charset)
{
http://cvs.php.net/diff.php/php-src/ext/iconv/php_iconv.h?r1=1.22&r2=1.23&ty=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.22 php-src/ext/iconv/php_iconv.h:1.23
--- php-src/ext/iconv/php_iconv.h:1.22 Thu Jan 8 12:32:11 2004
+++ php-src/ext/iconv/php_iconv.h Tue Nov 23 04:44:54 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.22 $ */
+/* $Revision: 1.23 $ */
#ifndef PHP_ICONV_H
#define PHP_ICONV_H
@@ -75,6 +75,22 @@
#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_MALFORMED = 7,
+ PHP_ICONV_ERR_ALLOC = 8
+} 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
