cvs: php-src /ext/mysqli php_mysqli.h
| From: | Antony Dovgal | Date: | Tue, 18 Oct 2005 13:51:21 +0000 |
| Subject: | cvs: php-src /ext/mysqli php_mysqli.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34655@lists.php.net to get a copy of this message | ||
tony2001 Tue Oct 18 09:51:21 2005 EDT
Modified files:
/php-src/ext/mysqli php_mysqli.h
Log:
use php_error_docref() instead of php_error() everywhere
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.55&r2=1.56&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.55 php-src/ext/mysqli/php_mysqli.h:1.56
--- php-src/ext/mysqli/php_mysqli.h:1.55 Mon Oct 10 08:59:47 2005
+++ php-src/ext/mysqli/php_mysqli.h Tue Oct 18 09:51:20 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.55 2005/10/10 12:59:47 tony2001 Exp $
+ $Id: php_mysqli.h,v 1.56 2005/10/18 13:51:20 tony2001 Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -204,17 +204,17 @@
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(E_WARNING, "Couldn't fetch %s", intern->zo.ce->name);\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s",
intern->zo.ce->name);\
RETURN_NULL();\
}\
if (!intern->valid) { \
- php_error(E_WARNING, "invalid resource %s", intern->zo.ce->name); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid resource %s",
intern->zo.ce->name); \
RETURN_NULL(); \
} \
__ptr = (__type)my_res->ptr; \
if (!strcmp((char *)__name, "mysqli_stmt")) {\
if (!((MY_STMT *)__ptr)->stmt->mysql) {\
- php_error(E_WARNING, "Statement isn't valid anymore");\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Statement isn't valid anymore");\
RETURN_NULL();\
}\
}\