felipe Mon Mar 30 16:52:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c
mysqlnd_ps_codec.c mysqlnd_result.c
mysqlnd_result_meta.c mysqlnd_statistics.c
php_mysqlnd.c
Log:
- MFH: Removed UG(unicode) checks
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.37&r2=1.5.2.38&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.37
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.38
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.37 Mon Feb 16 17:26:43 2009
+++ php-src/ext/mysqlnd/mysqlnd.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.5.2.37 2009/02/16 17:26:43 johannes Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.38 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -663,12 +663,12 @@
(charset =
mysqlnd_find_charset_name(conn->options.charset_name)))
{
auth_packet->charset_no = charset->nr;
+ } else {
#if PHP_MAJOR_VERSION >= 6
- } else if (UG(unicode)) {
auth_packet->charset_no = 200;/* utf8 - swedish collation,
check mysqlnd_charset.c */
-#endif
- } else {
+#else
auth_packet->charset_no = greet_packet.charset_no;
+#endif
}
auth_packet->db = db;
auth_packet->db_len = db_len;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.c?r1=1.1.2.14&r2=1.1.2.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.c
diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.14
php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.15
--- php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.14 Mon Mar 30 13:55:47 2009
+++ php-src/ext/mysqlnd/mysqlnd_debug.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_debug.c,v 1.1.2.14 2009/03/30 13:55:47 johannes Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.1.2.15 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -1107,6 +1107,7 @@
TRACE_APPEND_STR("Array, ");
break;
case IS_OBJECT: {
+ zval tmp;
zstr class_name;
zend_uint class_name_len;
int dup;
@@ -1115,16 +1116,11 @@
dup = zend_get_object_classname(*arg, &class_name,
&class_name_len TSRMLS_CC);
- if (UG(unicode)) {
- zval tmp;
+ ZVAL_UNICODEL(&tmp, class_name.u, class_name_len, 1);
+ convert_to_string_with_converter(&tmp,
ZEND_U_CONVERTER(UG(output_encoding_conv)));
+ TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp));
+ zval_dtor(&tmp);
- ZVAL_UNICODEL(&tmp, class_name.u,
class_name_len, 1);
- convert_to_string_with_converter(&tmp,
ZEND_U_CONVERTER(UG(output_encoding_conv)));
- TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp));
- zval_dtor(&tmp);
- } else {
- TRACE_APPEND_STRL(class_name.s, class_name_len);
- }
if(!dup) {
efree(class_name.v);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.2.2.14&r2=1.2.2.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.14
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.15
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.14 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_palloc.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_palloc.c,v 1.2.2.14 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.2.2.15 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -39,13 +39,6 @@
#endif
-#if PHP_MAJOR_VERSION < 6
-#define IS_UNICODE_DISABLED (1)
-#else
-#define IS_UNICODE_DISABLED (!UG(unicode))
-#endif
-
-
/* {{{ _mysqlnd_palloc_init_cache */
PHPAPI MYSQLND_ZVAL_PCACHE* _mysqlnd_palloc_init_cache(unsigned int cache_size
TSRMLS_DC)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps_codec.c?r1=1.3.2.14&r2=1.3.2.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps_codec.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.14
php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.15
--- php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.14 Mon Feb 16 17:26:43 2009
+++ php-src/ext/mysqlnd/mysqlnd_ps_codec.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_ps_codec.c,v 1.3.2.14 2009/02/16 17:26:43 johannes Exp $ */
+/* $Id: mysqlnd_ps_codec.c,v 1.3.2.15 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -685,7 +685,7 @@
#if PHP_MAJOR_VERSION < 6
if (Z_TYPE_P(the_var) != IS_STRING)
#elif PHP_MAJOR_VERSION >= 6
- if (Z_TYPE_P(the_var) != IS_STRING ||
(UG(unicode) && Z_TYPE_P(the_var) == IS_UNICODE))
+ if (Z_TYPE_P(the_var) != IS_STRING ||
Z_TYPE_P(the_var) == IS_UNICODE)
#endif
{
if (!copies || !copies[i]) {
@@ -693,7 +693,7 @@
}
the_var = copies[i];
#if PHP_MAJOR_VERSION >= 6
- if (UG(unicode) && Z_TYPE_P(the_var) ==
IS_UNICODE) {
+ if (Z_TYPE_P(the_var) == IS_UNICODE) {
zval_unicode_to_string_ex(the_var, UG(utf8_conv) TSRMLS_CC);
}
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.4.2.25&r2=1.4.2.26&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.25
php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.26
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.25 Tue Mar 17 09:51:31 2009
+++ php-src/ext/mysqlnd/mysqlnd_result.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result.c,v 1.4.2.25 2009/03/17 09:51:31 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.4.2.26 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -910,21 +910,18 @@
*/
if (zend_hash_key->is_numeric == FALSE)
{
#if PHP_MAJOR_VERSION >= 6
- if (UG(unicode)) {
-
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
-
zend_hash_key->ustr,
-
zend_hash_key->ulen + 1,
-
zend_hash_key->key,
-
(void *) &data, sizeof(zval *), NULL);
- } else
-#endif
- {
-
zend_hash_quick_update(Z_ARRVAL_P(row),
-
field->name,
-
field->name_length + 1,
-
zend_hash_key->key,
-
(void *) &data, sizeof(zval *), NULL);
- }
+
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
+
zend_hash_key->ustr,
+
zend_hash_key->ulen + 1,
+
zend_hash_key->key,
+
(void *) &data, sizeof(zval *), NULL);
+#else
+
zend_hash_quick_update(Z_ARRVAL_P(row),
+
field->name,
+
field->name_length + 1,
+
zend_hash_key->key,
+
(void *) &data, sizeof(zval *), NULL);
+#endif
} else {
zend_hash_index_update(Z_ARRVAL_P(row),
zend_hash_key->key,
@@ -1143,21 +1140,18 @@
*/
if (zend_hash_key->is_numeric == FALSE) {
#if PHP_MAJOR_VERSION >= 6
- if (UG(unicode)) {
-
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
-
zend_hash_key->ustr,
-
zend_hash_key->ulen + 1,
-
zend_hash_key->key,
-
(void *) &data, sizeof(zval *), NULL);
- } else
+
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
+
zend_hash_key->ustr,
+
zend_hash_key->ulen + 1,
+
zend_hash_key->key,
+
(void *) &data, sizeof(zval *), NULL);
+#else
+ zend_hash_quick_update(Z_ARRVAL_P(row),
+
field->name,
+
field->name_length + 1,
+
zend_hash_key->key,
+
(void *) &data, sizeof(zval *), NULL);
#endif
- {
-
zend_hash_quick_update(Z_ARRVAL_P(row),
-
field->name,
-
field->name_length + 1,
-
zend_hash_key->key,
-
(void *) &data, sizeof(zval *), NULL);
- }
} else {
zend_hash_index_update(Z_ARRVAL_P(row),
zend_hash_key->key,
@@ -1419,21 +1413,18 @@
*/
if (result->meta->zend_hash_keys[i].is_numeric
== FALSE) {
#if PHP_MAJOR_VERSION >= 6
- if (UG(unicode)) {
-
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
-
result->meta->zend_hash_keys[i].ustr,
-
result->meta->zend_hash_keys[i].ulen + 1,
-
result->meta->zend_hash_keys[i].key,
-
(void *) &data, sizeof(zval *), NULL);
- } else
+
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
+
result->meta->zend_hash_keys[i].ustr,
+
result->meta->zend_hash_keys[i].ulen + 1,
+
result->meta->zend_hash_keys[i].key,
+
(void *) &data, sizeof(zval *), NULL);
+#else
+ zend_hash_quick_update(Z_ARRVAL_P(row),
+
result->meta->fields[i].name,
+
result->meta->fields[i].name_length + 1,
+
result->meta->zend_hash_keys[i].key,
+
(void *) &data, sizeof(zval *), NULL);
#endif
- {
-
zend_hash_quick_update(Z_ARRVAL_P(row),
-
result->meta->fields[i].name,
-
result->meta->fields[i].name_length + 1,
-
result->meta->zend_hash_keys[i].key,
-
(void *) &data, sizeof(zval *), NULL);
- }
} else {
zend_hash_index_update(Z_ARRVAL_P(row),
result->meta->zend_hash_keys[i].key,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result_meta.c?r1=1.3.2.7&r2=1.3.2.8&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result_meta.c
diff -u php-src/ext/mysqlnd/mysqlnd_result_meta.c:1.3.2.7
php-src/ext/mysqlnd/mysqlnd_result_meta.c:1.3.2.8
--- php-src/ext/mysqlnd/mysqlnd_result_meta.c:1.3.2.7 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_result_meta.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result_meta.c,v 1.3.2.7 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_result_meta.c,v 1.3.2.8 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -143,6 +143,10 @@
{
unsigned int i = 0;
php_mysql_packet_res_field field_packet;
+#if PHP_MAJOR_VERSION >= 6
+ UChar *ustr;
+ int ulen;
+#endif
DBG_ENTER("mysqlnd_res_meta::read_metadata");
@@ -212,39 +216,33 @@
}
#if PHP_MAJOR_VERSION >= 6
- if (UG(unicode)) {
- UChar *ustr;
- int ulen;
- zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen,
-
meta->fields[i].name,
-
meta->fields[i].name_length TSRMLS_CC);
- if ((meta->zend_hash_keys[i].is_numeric =
-
mysqlnd_unicode_is_key_numeric(ustr, ulen + 1, &idx)))
- {
- meta->zend_hash_keys[i].key = idx;
- mnd_efree(ustr);
- } else {
- meta->zend_hash_keys[i].ustr.u = ustr;
- meta->zend_hash_keys[i].ulen = ulen;
- meta->zend_hash_keys[i].key =
zend_u_get_hash_value(IS_UNICODE, ZSTR(ustr), ulen + 1);
- }
-
- } else
-#endif
+ zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen,
+ meta->fields[i].name,
+
meta->fields[i].name_length TSRMLS_CC);
+ if ((meta->zend_hash_keys[i].is_numeric =
+
mysqlnd_unicode_is_key_numeric(ustr, ulen + 1, &idx)))
{
- /* For BC we have to check whether the key is numeric
and use it like this */
- if ((meta->zend_hash_keys[i].is_numeric =
-
mysqlnd_is_key_numeric(field_packet.metadata->name,
-
field_packet.metadata->name_length + 1,
-
&idx)))
- {
- meta->zend_hash_keys[i].key = idx;
- } else {
- meta->zend_hash_keys[i].key =
-
zend_get_hash_value(field_packet.metadata->name,
-
field_packet.metadata->name_length + 1);
- }
+ meta->zend_hash_keys[i].key = idx;
+ mnd_efree(ustr);
+ } else {
+ meta->zend_hash_keys[i].ustr.u = ustr;
+ meta->zend_hash_keys[i].ulen = ulen;
+ meta->zend_hash_keys[i].key =
zend_u_get_hash_value(IS_UNICODE, ZSTR(ustr), ulen + 1);
+ }
+#else
+ /* For BC we have to check whether the key is numeric and use
it like this */
+ if ((meta->zend_hash_keys[i].is_numeric =
+
mysqlnd_is_key_numeric(field_packet.metadata->name,
+
field_packet.metadata->name_length + 1,
+
&idx)))
+ {
+ meta->zend_hash_keys[i].key = idx;
+ } else {
+ meta->zend_hash_keys[i].key =
+
zend_get_hash_value(field_packet.metadata->name,
+
field_packet.metadata->name_length + 1);
}
+#endif
}
PACKET_FREE_ALLOCA(field_packet);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.c?r1=1.2.2.9&r2=1.2.2.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.c
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.9
php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.10
--- php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.9 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_statistics.c,v 1.2.2.9 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.2.2.10 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -164,26 +164,24 @@
mysqlnd_array_init(return_value, STAT_LAST);
for (i = 0; i < STAT_LAST; i++) {
+#if PHP_MAJOR_VERSION >= 6
+ UChar *ustr, *tstr;
+ int ulen, tlen;
+#endif
char tmp[22];
sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]);
#if PHP_MAJOR_VERSION >= 6
- if (UG(unicode)) {
- UChar *ustr, *tstr;
- int ulen, tlen;
-
- zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen,
mysqlnd_stats_values_names[i].s,
-
mysqlnd_stats_values_names[i].l + 1 TSRMLS_CC);
- zend_string_to_unicode(UG(utf8_conv), &tstr, &tlen,
tmp, strlen(tmp) + 1 TSRMLS_CC);
- add_u_assoc_unicode_ex(return_value, IS_UNICODE,
ZSTR(ustr), ulen, tstr, 1);
- efree(ustr);
- efree(tstr);
- } else
-#endif
- {
- add_assoc_string_ex(return_value,
mysqlnd_stats_values_names[i].s,
-
mysqlnd_stats_values_names[i].l + 1, tmp, 1);
- }
+ zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen,
mysqlnd_stats_values_names[i].s,
+
mysqlnd_stats_values_names[i].l + 1 TSRMLS_CC);
+ zend_string_to_unicode(UG(utf8_conv), &tstr, &tlen, tmp,
strlen(tmp) + 1 TSRMLS_CC);
+ add_u_assoc_unicode_ex(return_value, IS_UNICODE, ZSTR(ustr),
ulen, tstr, 1);
+ efree(ustr);
+ efree(tstr);
+#else
+ add_assoc_string_ex(return_value,
mysqlnd_stats_values_names[i].s,
+
mysqlnd_stats_values_names[i].l + 1, tmp, 1);
+#endif
}
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.1.2.8&r2=1.1.2.9&diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.1.2.8
php-src/ext/mysqlnd/php_mysqlnd.c:1.1.2.9
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.1.2.8 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/php_mysqlnd.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysqlnd.c,v 1.1.2.8 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: php_mysqlnd.c,v 1.1.2.9 2009/03/30 16:52:33 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
#include "mysqlnd.h"
@@ -51,23 +51,19 @@
zstr string_key;
uint string_key_len;
ulong num_key;
+ int s_len;
char *s = NULL;
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key,
&string_key_len, &num_key, 0, &pos_values);
convert_to_string(*values_entry);
- if (UG(unicode)) {
- int s_len;
- if
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
- &s,
&s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
- php_info_print_table_row(2, s,
Z_STRVAL_PP(values_entry));
- }
- if (s) {
- mnd_efree(s);
- }
- } else {
- php_info_print_table_row(2, string_key.s,
Z_STRVAL_PP(values_entry));
+ if
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
+ &s, &s_len,
string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
+ php_info_print_table_row(2, s,
Z_STRVAL_PP(values_entry));
+ }
+ if (s) {
+ mnd_efree(s);
}
zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos_values);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
