PHP mysqlnd svn commit: r571 - trunk/php6/ext/mysqli

Author: ahristov
Date: 2007-06-28 16:19:27 +0200 (Thu, 28 Jun 2007) New Revision: 571

Modified:

   trunk/php6/ext/mysqli/mysqli_prop.c
   trunk/php6/ext/mysqli/php_mysqli_structs.h Log:
Unicode fixes

Modified: trunk/php6/ext/mysqli/mysqli_prop.c

• trunk/php6/ext/mysqli/mysqli_prop.c 2007-06-28 14:05:22 UTC (rev 570) +++ trunk/php6/ext/mysqli/mysqli_prop.c 2007-06-28 14:19:27 UTC (rev 571)
  @@ -42,7 +42,7 @@
  MYSQL *p; \ ALLOC_ZVAL(*retval);\ if (!obj->ptr || !(MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", obj->zo.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %v", obj->zo.ce->name);\ ZVAL_NULL(*retval);\ return SUCCESS; \ } else { \
  @@ -54,7 +54,7 @@
  MYSQL_RES *p; \ ALLOC_ZVAL(*retval);\ if (!obj->ptr) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", obj->zo.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %v", obj->zo.ce->name);\ ZVAL_NULL(*retval);\ return SUCCESS; \ } else { \
  @@ -67,7 +67,7 @@
  MYSQL_STMT *p; \ ALLOC_ZVAL(*retval);\ if (!obj->ptr) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", obj->zo.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %v", obj->zo.ce->name);\ ZVAL_NULL(*retval);\ return SUCCESS; \ } else { \

Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h

• trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-06-28 14:05:22 UTC (rev 570) +++ trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-06-28 14:19:27 UTC (rev 571)
  @@ -257,12 +257,12 @@
  MYSQLI_RESOURCE *my_res; \ mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\ if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", intern->zo.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %v", intern->zo.ce->name);\ RETURN_NULL();\ }\ __ptr = (__type)my_res->ptr; \ if (__check && my_res->status < __check) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid object or resource %s\n", intern->zo.ce->name); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid object or resource %v", intern->zo.ce->name); \ RETURN_NULL();\ }\ }

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com