dmitry Tue Aug 23 05:33:47 2005 EDT
Modified files:
/ZendEngine2 zend_API.h
/php-src/ext/pdo pdo_dbh.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/spl spl_functions.c spl_sxe.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard array.c basic_functions.c image.c md5.c
string.c
Log:
Unicode support cleanup
http://cvs.php.net/diff.php/ZendEngine2/zend_API.h?r1=1.217&r2=1.218&ty=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.217 ZendEngine2/zend_API.h:1.218
--- ZendEngine2/zend_API.h:1.217 Mon Aug 22 08:22:07 2005
+++ ZendEngine2/zend_API.h Tue Aug 23 05:33:43 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.h,v 1.217 2005/08/22 12:22:07 dmitry Exp $ */
+/* $Id: zend_API.h,v 1.218 2005/08/23 09:33:43 dmitry Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -604,6 +604,41 @@
(z)->type = IS_STRING; \
}
+#define ZVAL_U_STRING(conv, z, s, duplicate) \
+ if (UG(unicode)) { \
+ UErrorCode status = U_ZERO_ERROR; \
+ UChar *u_str; \
+ int32_t u_len; \
+ uint length = strlen(s); \
+ zend_convert_to_unicode(conv, &u_str, &u_len, s, length,
&status); \
+ ZVAL_UNICODEL(z, u_str, u_len, 0); \
+ } else { \
+ char *__s=(s); \
+ (z)->value.str.len = strlen(__s); \
+ (z)->value.str.val = (duplicate?estrndup(__s,
(z)->value.str.len):__s); \
+ (z)->type = IS_STRING; \
+ }
+
+#define ZVAL_U_STRINGL(conv, z, s, l, duplicate) \
+ if (UG(unicode)) { \
+ UErrorCode status = U_ZERO_ERROR; \
+ UChar *u_str; \
+ int32_t u_len; \
+ zend_convert_to_unicode(conv, &u_str, &u_len, s, l, &status); \
+ ZVAL_UNICODEL(z, u_str, u_len, 0); \
+ } else { \
+ char *__s=(s); int __l=l; \
+ (z)->value.str.len = __l; \
+ (z)->value.str.val = (duplicate?estrndup(__s, __l):__s);
\
+ (z)->type = IS_STRING; \
+ }
+
+#define ZVAL_RT_STRING(z, s, duplicate) \
+ ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), z, s,
duplicate)
+
+#define ZVAL_RT_STRINGL(z, s, l, duplicate) \
+ ZVAL_U_STRINGL(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), z, s, l,
duplicate)
+
#define ZVAL_UNICODE(z, u, duplicate) { \
UChar *__u=(u); \
(z)->value.ustr.len = u_strlen(__u); \
@@ -705,6 +740,10 @@
#define RETVAL_STRINGL(s, l, duplicate) ZVAL_STRINGL(return_value, s,
l, duplicate)
#define RETVAL_ASCII_STRING(s, duplicate)
ZVAL_ASCII_STRING(return_value, s, duplicate)
#define RETVAL_ASCII_STRINGL(s, l, duplicate)
ZVAL_ASCII_STRINGL(return_value, s, l, duplicate)
+#define RETVAL_U_STRING(conv, s, duplicate) ZVAL_U_STRING(conv,
return_value, s, duplicate)
+#define RETVAL_U_STRINGL(conv, s, l, duplicate) ZVAL_U_STRINGL(conv,
return_value, s, l, duplicate)
+#define RETVAL_RT_STRING(s, duplicate)
ZVAL_RT_STRING(return_value, s, duplicate)
+#define RETVAL_RT_STRINGL(s, l, duplicate) ZVAL_RT_STRINGL(return_value,
s, l, duplicate)
#define RETVAL_EMPTY_STRING() ZVAL_EMPTY_STRING(return_value)
#define RETVAL_UNICODE(u, duplicate) ZVAL_UNICODE(return_value, u,
duplicate)
#define RETVAL_UNICODEL(u, l, duplicate) ZVAL_UNICODEL(return_value, u,
l, duplicate)
@@ -739,6 +778,10 @@
#define RETURN_TEXTL(t, l, duplicate) { RETVAL_TEXTL(t, l, duplicate);
return; }
#define RETURN_ASCII_STRING(t, duplicate) {
RETVAL_ASCII_STRING(t, duplicate); return; }
#define RETURN_ASCII_STRINGL(t, l, duplicate) { RETVAL_ASCII_STRINGL(t, l,
duplicate); return; }
+#define RETURN_U_STRING(conv, t, duplicate) { RETVAL_U_STRING(conv,
t, duplicate); return; }
+#define RETURN_U_STRINGL(conv, t, l, duplicate) {
RETVAL_U_STRINGL(conv, t, l, duplicate); return; }
+#define RETURN_RT_STRING(t, duplicate) { RETVAL_RT_STRING(t,
duplicate); return; }
+#define RETURN_RT_STRINGL(t, l, duplicate) { RETVAL_RT_STRINGL(t, l,
duplicate); return; }
#define SET_VAR_STRING(n, v) {
\
{
\
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.87&r2=1.88&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.87 php-src/ext/pdo/pdo_dbh.c:1.88
--- php-src/ext/pdo/pdo_dbh.c:1.87 Tue Aug 16 14:22:22 2005
+++ php-src/ext/pdo/pdo_dbh.c Tue Aug 23 05:33:44 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.87 2005/08/16 18:22:22 andrei Exp $ */
+/* $Id: pdo_dbh.c,v 1.88 2005/08/23 09:33:44 dmitry Exp $ */
/* The PDO Database Handle Class */
@@ -428,19 +428,8 @@
zval z_key;
MAKE_STD_ZVAL(query_string);
- if (UG(unicode)) {
- UErrorCode status = U_ZERO_ERROR;
- UChar *u_str;
- int32_t u_len;
-
-
zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str,
&u_len, stmt->query_string, stmt->query_stringlen, &status);
- ZVAL_UNICODEL(query_string, u_str, u_len, 0);
- u_str = zend_ascii_to_unicode("queryString",
sizeof("queryString") ZEND_FILE_LINE_CC);
- ZVAL_UNICODEL(&z_key, u_str, sizeof("queryString")-1, 0);
- } else {
- ZVAL_STRINGL(query_string, stmt->query_string,
stmt->query_stringlen, 1);
- ZVAL_STRINGL(&z_key, "queryString", sizeof("queryString")-1, 0);
- }
+ ZVAL_RT_STRINGL(query_string, stmt->query_string,
stmt->query_stringlen, 1);
+ ZVAL_ASCII_STRINGL(&z_key, "queryString", sizeof("queryString")-1, 0);
std_object_handlers.write_property(object, &z_key, query_string
TSRMLS_CC);
zval_ptr_dtor(&query_string);
if (UG(unicode)) {
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.157&r2=1.158&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.157
php-src/ext/simplexml/simplexml.c:1.158
--- php-src/ext/simplexml/simplexml.c:1.157 Thu Aug 18 09:34:01 2005
+++ php-src/ext/simplexml/simplexml.c Tue Aug 23 05:33:44 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.157 2005/08/18 13:34:01 sniper Exp $ */
+/* $Id: simplexml.c,v 1.158 2005/08/23 09:33:44 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -706,10 +706,7 @@
} else {
if (node->type == XML_TEXT_NODE) {
MAKE_STD_ZVAL(value);
- ZVAL_STRING(value,
xmlNodeListGetString(node->doc, node, 1), 1);
- if (UG(unicode)) {
- convert_to_unicode(value);
- }
+
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value,
xmlNodeListGetString(node->doc, node, 1), 1);
zend_hash_next_index_insert(rv, &value,
sizeof(zval *), NULL);
goto next_iter;
}
@@ -1763,7 +1760,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.157 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.158 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.c?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.31
php-src/ext/spl/spl_functions.c:1.32
--- php-src/ext/spl/spl_functions.c:1.31 Mon Aug 15 19:01:42 2005
+++ php-src/ext/spl/spl_functions.c Tue Aug 23 05:33:45 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.c,v 1.31 2005/08/15 23:01:42 tony2001 Exp $ */
+/* $Id: spl_functions.c,v 1.32 2005/08/23 09:33:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -119,11 +119,7 @@
if (zend_u_hash_find(Z_ARRVAL_P(list), ztype, pce->name, len+1,
(void*)&tmp) == FAILURE) {
MAKE_STD_ZVAL(tmp);
- if (UG(unicode)) {
- ZVAL_UNICODEL(tmp, (UChar *)pce->name,
pce->name_length, 1);
- } else {
- ZVAL_STRINGL(tmp, pce->name, pce->name_length,
1);
- }
+ ZVAL_TEXTL(tmp, pce->name, pce->name_length, 1);
zend_u_hash_add(Z_ARRVAL_P(list), ztype, pce->name,
len+1, &tmp, sizeof(zval *), NULL);
}
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_sxe.c?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.10 php-src/ext/spl/spl_sxe.c:1.11
--- php-src/ext/spl/spl_sxe.c:1.10 Tue Aug 16 11:09:46 2005
+++ php-src/ext/spl/spl_sxe.c Tue Aug 23 05:33:45 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_sxe.c,v 1.10 2005/08/16 15:09:46 dmitry Exp $ */
+/* $Id: spl_sxe.c,v 1.11 2005/08/23 09:33:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -80,19 +80,10 @@
intern = (php_sxe_object *)zend_object_store_get_object(sxe->iter.data
TSRMLS_CC);
if (intern != NULL && intern->node != NULL) {
curnode = (xmlNodePtr)((php_libxml_node_ptr
*)intern->node)->node;
- if (UG(unicode)) {
- UErrorCode status = U_ZERO_ERROR;
- UChar *u_str;
- int32_t u_len;
-
-
zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str,
&u_len, (char*)curnode->name, xmlStrlen(curnode->name), &status);
- RETURN_UNICODEL(u_str, u_len, 0);
- } else {
- RETURN_STRINGL((char*)curnode->name,
xmlStrlen(curnode->name), 1);
- }
+ RETURN_U_STRINGL(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
(char*)curnode->name, xmlStrlen(curnode->name), 1);
}
- RETURN_FALSE;
+ RETURN_FALSE;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.170&r2=1.171&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.170 php-src/ext/sqlite/sqlite.c:1.171
--- php-src/ext/sqlite/sqlite.c:1.170 Mon Aug 22 08:22:13 2005
+++ php-src/ext/sqlite/sqlite.c Tue Aug 23 05:33:45 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.170 2005/08/22 12:22:13 dmitry Exp $
+ $Id: sqlite.c,v 1.171 2005/08/23 09:33:45 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1126,7 +1126,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.170 2005/08/22 12:22:13 dmitry
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.171 2005/08/23 09:33:45 dmitry
Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1917,11 +1917,7 @@
char *decoded = emalloc(l);
l = php_sqlite_decode_binary(rowdata[j]+1, decoded);
decoded[l] = '\0';
- if (UG(unicode)) {
- RETVAL_BINARYL(decoded, l, 0);
- } else {
- RETVAL_STRINGL(decoded, l, 0);
- }
+ RETVAL_BINARYL(decoded, l, 0);
if (!res->buffered) {
efree((char*)rowdata[j]);
rowdata[j] = NULL;
@@ -2444,13 +2440,7 @@
if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT;
}
- if (UG(unicode)) {
- char *temp = (char*)sqlite_libversion();
- UChar *u_temp = zend_ascii_to_unicode(temp, strlen(temp)+1
ZEND_FILE_LINE_CC);
- RETURN_UNICODE(u_temp, 0);
- } else {
- RETURN_STRING((char*)sqlite_libversion(), 1);
- }
+ RETURN_ASCII_STRING((char*)sqlite_libversion(), 1);
}
/* }}} */
@@ -2461,13 +2451,7 @@
if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT;
}
- if (UG(unicode)) {
- char *temp = (char*)sqlite_libencoding();
- UChar *u_temp = zend_ascii_to_unicode(temp, strlen(temp)+1
ZEND_FILE_LINE_CC);
- RETURN_UNICODE(u_temp, 0);
- } else {
- RETURN_STRING((char*)sqlite_libencoding(), 1);
- }
+ RETURN_ASCII_STRING((char*)sqlite_libencoding(), 1);
}
/* }}} */
@@ -2664,16 +2648,7 @@
RETURN_FALSE;
}
- if (UG(unicode)) {
- UErrorCode status = U_ZERO_ERROR;
- UChar *u_str;
- int32_t u_len;
-
-
zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str,
&u_len, res->col_names[field], strlen(res->col_names[field]), &status);
- RETURN_UNICODEL(u_str, u_len, 0);
- } else {
- RETURN_STRING(res->col_names[field], 1);
- }
+ RETURN_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
res->col_names[field], 1);
}
/* }}} */
@@ -2914,16 +2889,7 @@
msg = sqlite_error_string(code);
if (msg) {
- if (UG(unicode)) {
- UErrorCode status = U_ZERO_ERROR;
- UChar *u_str;
- int32_t u_len;
-
-
zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str,
&u_len, msg, strlen(msg), &status);
- RETURN_UNICODEL(u_str, u_len, 0);
- } else {
- RETURN_STRING((char*)msg, 1);
- }
+ RETURN_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
(char*)msg, 1);
} else {
RETURN_NULL();
}
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.321&r2=1.322&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.321 php-src/ext/standard/array.c:1.322
--- php-src/ext/standard/array.c:1.321 Mon Aug 22 08:22:13 2005
+++ php-src/ext/standard/array.c Tue Aug 23 05:33:45 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.321 2005/08/22 12:22:13 dmitry Exp $ */
+/* $Id: array.c,v 1.322 2005/08/23 09:33:45 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1461,11 +1461,7 @@
/* break omitted intentionally */
case EXTR_OVERWRITE:
- if (UG(unicode)) {
- ZVAL_UNICODEL(&final_name, var_name,
var_name_len, 1);
- } else {
- ZVAL_STRINGL(&final_name, var_name,
var_name_len, 1);
- }
+ ZVAL_TEXTL(&final_name, var_name, var_name_len,
1);
break;
case EXTR_PREFIX_IF_EXISTS:
@@ -1489,11 +1485,7 @@
case EXTR_PREFIX_SAME:
if (!var_exists) {
- if (UG(unicode)) {
- ZVAL_UNICODEL(&final_name,
var_name, var_name_len, 1);
- } else {
- ZVAL_STRINGL(&final_name,
var_name, var_name_len, 1);
- }
+ ZVAL_TEXTL(&final_name, var_name,
var_name_len, 1);
}
/* break omitted intentionally */
@@ -1534,22 +1526,14 @@
memcpy(Z_STRVAL(final_name)+Z_STRLEN_PP(prefix)+1, var_name, var_name_len+1);
}
} else {
- if (UG(unicode)) {
-
ZVAL_UNICODEL(&final_name, var_name, var_name_len, 1);
- } else {
-
ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);
- }
+ ZVAL_TEXTL(&final_name,
var_name, var_name_len, 1);
}
}
break;
default:
if (!var_exists) {
- if (UG(unicode)) {
- ZVAL_UNICODEL(&final_name,
var_name, var_name_len, 1);
- } else {
- ZVAL_STRINGL(&final_name,
var_name, var_name_len, 1);
- }
+ ZVAL_TEXTL(&final_name, var_name,
var_name_len, 1);
}
break;
}
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.730&r2=1.731&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.730
php-src/ext/standard/basic_functions.c:1.731
--- php-src/ext/standard/basic_functions.c:1.730 Mon Aug 22 08:22:14 2005
+++ php-src/ext/standard/basic_functions.c Tue Aug 23 05:33:45 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.730 2005/08/22 12:22:14 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.731 2005/08/23 09:33:45 dmitry Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1691,7 +1691,7 @@
MAKE_STD_ZVAL(val);
if (optarg != NULL) {
- ZVAL_STRING(val, optarg, 1);
+ ZVAL_RT_STRING(val, optarg, 1);
} else {
ZVAL_FALSE(val);
}
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.115&r2=1.116&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.115 php-src/ext/standard/image.c:1.116
--- php-src/ext/standard/image.c:1.115 Tue Aug 16 05:11:00 2005
+++ php-src/ext/standard/image.c Tue Aug 23 05:33:46 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.115 2005/08/16 09:11:00 dmitry Exp $ */
+/* $Id: image.c,v 1.116 2005/08/23 09:33:46 dmitry Exp $ */
#include "php.h"
#include <stdio.h>
@@ -1128,12 +1128,7 @@
}
convert_to_long_ex(p_image_type);
temp = (char*)php_image_type_to_mime_type(Z_LVAL_PP(p_image_type));
- if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(temp, strlen(temp)+1
ZEND_FILE_LINE_CC);
- ZVAL_UNICODE(return_value, u_temp, 0);
- } else {
- ZVAL_STRING(return_value, temp, 1);
- }
+ ZVAL_ASCII_STRING(return_value, temp, 1);
}
/* }}} */
@@ -1177,12 +1172,7 @@
temp = ".xbm";
}
if (temp) {
- if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(temp + !inc_dot,
strlen(temp)+inc_dot ZEND_FILE_LINE_CC);
- RETURN_UNICODE(u_temp, 0);
- } else {
- RETURN_STRING(temp + !inc_dot, 1);
- }
+ RETURN_ASCII_STRING(temp + !inc_dot, 1);
}
RETURN_FALSE;
@@ -1373,12 +1363,9 @@
add_index_long(return_value, 1, result->height);
add_index_long(return_value, 2, itype);
spprintf(&temp, 0, "width=\"%d\" height=\"%d\"", result->width,
result->height);
+ add_index_ascii_string(return_value, 3, temp, 0);
if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(temp,
strlen(temp)+1 ZEND_FILE_LINE_CC);
- add_index_unicode(return_value, 3, u_temp, 0);
efree(temp);
- } else {
- add_index_string(return_value, 3, temp, 0);
}
if (result->bits != 0) {
@@ -1388,12 +1375,7 @@
add_assoc_long(return_value, "channels",
result->channels);
}
temp = (char*)php_image_type_to_mime_type(itype);
- if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(temp,
strlen(temp)+1 ZEND_FILE_LINE_CC);
- add_assoc_unicode(return_value, "mime", u_temp, 0);
- } else {
- add_assoc_string(return_value, "mime", temp, 1);
- }
+ add_assoc_ascii_string(return_value, "mime", temp, 1);
efree(result);
} else {
RETURN_FALSE;
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.41&r2=1.42&ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.41 php-src/ext/standard/md5.c:1.42
--- php-src/ext/standard/md5.c:1.41 Tue Aug 16 15:45:00 2005
+++ php-src/ext/standard/md5.c Tue Aug 23 05:33:46 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: md5.c,v 1.41 2005/08/16 19:45:00 andrei Exp $ */
+/* $Id: md5.c,v 1.42 2005/08/23 09:33:46 dmitry Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -61,12 +61,7 @@
RETURN_BINARYL(digest, 16, 1);
} else {
make_digest(md5str, digest);
- if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(md5str, 33
ZEND_FILE_LINE_CC);
- RETVAL_UNICODE(u_temp, 0);
- } else {
- RETVAL_STRING(md5str, 1);
- }
+ RETVAL_ASCII_STRING(md5str, 1);
}
}
@@ -113,12 +108,7 @@
RETURN_BINARYL(digest, 16, 1);
} else {
make_digest(md5str, digest);
- if (UG(unicode)) {
- UChar *u_temp = zend_ascii_to_unicode(md5str, 33
ZEND_FILE_LINE_CC);
- RETVAL_UNICODE(u_temp, 0);
- } else {
- RETVAL_STRING(md5str, 1);
- }
+ RETVAL_ASCII_STRING(md5str, 1);
}
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.470&r2=1.471&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.470 php-src/ext/standard/string.c:1.471
--- php-src/ext/standard/string.c:1.470 Mon Aug 22 10:14:10 2005
+++ php-src/ext/standard/string.c Tue Aug 23 05:33:46 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.470 2005/08/22 14:14:10 dmitry Exp $ */
+/* $Id: string.c,v 1.471 2005/08/23 09:33:46 dmitry Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1459,11 +1459,7 @@
WRONG_PARAM_COUNT;
}
if (Z_TYPE_PP(arg) != IS_STRING && Z_TYPE_PP(arg) != IS_UNICODE) {
- if (UG(unicode)) {
- convert_to_unicode_ex(arg);
- } else {
- convert_to_string_ex(arg);
- }
+ convert_to_text_ex(arg);
}
RETVAL_ZVAL(*arg, 1, 0);
@@ -1532,11 +1528,7 @@
WRONG_PARAM_COUNT;
}
if (Z_TYPE_PP(str) != IS_STRING && Z_TYPE_PP(str) != IS_UNICODE) {
- if (UG(unicode)) {
- convert_to_unicode_ex(str);
- } else {
- convert_to_string_ex(str);
- }
+ convert_to_text_ex(str);
}
RETVAL_ZVAL(*str, 1, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
