summaryrefslogtreecommitdiff
path: root/ext/pdo_sqlite
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2014-05-03 16:06:27 +0800
committerXinchen Hui <laruence@gmail.com>2014-05-03 16:08:58 +0800
commitd8651fbe1c4caaaedc42cef1dee0dd3b3f1e447e (patch)
tree499ace92cf766bf5cd5a1220d54498632416526f /ext/pdo_sqlite
parent5984f95d8f8d75007fff4963d67ebe65e572efea (diff)
downloadphp-git-d8651fbe1c4caaaedc42cef1dee0dd3b3f1e447e.tar.gz
Make they are in the same style of Z_ISREF
Diffstat (limited to 'ext/pdo_sqlite')
-rw-r--r--ext/pdo_sqlite/sqlite_driver.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
index 25a6c7053e..ebb16d9920 100644
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -118,13 +118,13 @@ static void pdo_sqlite_cleanup_callbacks(pdo_sqlite_db_handle *H TSRMLS_DC)
}
efree((char*)func->funcname);
- if (!ZVAL_IS_UNDEF(&func->func)) {
+ if (!Z_ISUNDEF(func->func)) {
zval_ptr_dtor(&func->func);
}
- if (!ZVAL_IS_UNDEF(&func->step)) {
+ if (!Z_ISUNDEF(func->step)) {
zval_ptr_dtor(&func->step);
}
- if (!ZVAL_IS_UNDEF(&func->fini)) {
+ if (!Z_ISUNDEF(func->fini)) {
zval_ptr_dtor(&func->fini);
}
efree(func);
@@ -145,7 +145,7 @@ static void pdo_sqlite_cleanup_callbacks(pdo_sqlite_db_handle *H TSRMLS_DC)
}
efree((char*)collation->name);
- if (!ZVAL_IS_UNDEF(&collation->callback)) {
+ if (!Z_ISUNDEF(collation->callback)) {
zval_ptr_dtor(&collation->callback);
}
efree(collation);
@@ -344,7 +344,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb,
if (!agg_context) {
ZVAL_NULL(&zargs[0]);
} else {
- if (ZVAL_IS_UNDEF(&agg_context->val)) {
+ if (Z_ISUNDEF(agg_context->val)) {
GC_REFCOUNT(agg_context) = 1;
GC_TYPE_INFO(agg_context) = IS_REFERENCE;
ZVAL_NULL(&agg_context->val);
@@ -397,7 +397,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb,
if (!is_agg || !argv) {
/* only set the sqlite return value if we are a scalar function,
* or if we are finalizing an aggregate */
- if (!ZVAL_IS_UNDEF(&retval)) {
+ if (!Z_ISUNDEF(retval)) {
switch (Z_TYPE(retval)) {
case IS_LONG:
sqlite3_result_int(context, Z_LVAL(retval));
@@ -429,7 +429,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb,
if (agg_context) {
zval_ptr_dtor(&agg_context->val);
}
- if (!ZVAL_IS_UNDEF(&retval)) {
+ if (!Z_ISUNDEF(retval)) {
ZVAL_COPY_VALUE(&agg_context->val, &retval);
ZVAL_UNDEF(&retval);
} else {
@@ -437,7 +437,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb,
}
}
- if (!ZVAL_IS_UNDEF(&retval)) {
+ if (!Z_ISUNDEF(retval)) {
zval_ptr_dtor(&retval);
}
@@ -495,7 +495,7 @@ static int php_sqlite3_collation_callback(void *context,
if ((ret = zend_call_function(&collation->fc.fci, &collation->fc.fcc TSRMLS_CC)) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred while invoking the callback");
- } else if (!ZVAL_IS_UNDEF(&retval)) {
+ } else if (!Z_ISUNDEF(retval)) {
if (Z_TYPE(retval) != IS_LONG) {
convert_to_long_ex(&retval);
}