diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:19:15 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:19:15 +0300 |
| commit | b2cdde08269c837a6c085dbc5d102c4b318b6150 (patch) | |
| tree | eaeec880c2f116598826522eb8052253363b5e85 /ext/sqlite3 | |
| parent | 4d1d5babde725febc5fdc7a7ccf576f3d0e3c099 (diff) | |
| parent | 83804519dffcbb23ef689b37816ee28f2c3192e0 (diff) | |
| download | php-git-b2cdde08269c837a6c085dbc5d102c4b318b6150.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros
Diffstat (limited to 'ext/sqlite3')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index c0f88198f3..b993d622ff 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -483,7 +483,8 @@ PHP_METHOD(sqlite3, prepare) object_init_ex(return_value, php_sqlite3_stmt_entry); stmt_obj = Z_SQLITE3_STMT_P(return_value); stmt_obj->db_obj = db_obj; - ZVAL_COPY(&stmt_obj->db_obj_zval, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&stmt_obj->db_obj_zval, Z_OBJ_P(object)); errcode = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL); if (errcode != SQLITE_OK) { @@ -496,7 +497,7 @@ PHP_METHOD(sqlite3, prepare) free_item = emalloc(sizeof(php_sqlite3_free_list)); free_item->stmt_obj = stmt_obj; - ZVAL_COPY_VALUE(&free_item->stmt_obj_zval, return_value); + ZVAL_OBJ(&free_item->stmt_obj_zval, Z_OBJ_P(return_value)); zend_llist_add_element(&(db_obj->free_list), &free_item); } @@ -538,7 +539,8 @@ PHP_METHOD(sqlite3, query) object_init_ex(&stmt, php_sqlite3_stmt_entry); stmt_obj = Z_SQLITE3_STMT_P(&stmt); stmt_obj->db_obj = db_obj; - ZVAL_COPY(&stmt_obj->db_obj_zval, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&stmt_obj->db_obj_zval, Z_OBJ_P(object)); return_code = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL); if (return_code != SQLITE_OK) { @@ -553,7 +555,7 @@ PHP_METHOD(sqlite3, query) result = Z_SQLITE3_RESULT_P(return_value); result->db_obj = db_obj; result->stmt_obj = stmt_obj; - ZVAL_COPY_VALUE(&result->stmt_obj_zval, &stmt); + ZVAL_OBJ(&result->stmt_obj_zval, Z_OBJ(stmt)); return_code = sqlite3_step(result->stmt_obj->stmt); @@ -1733,7 +1735,8 @@ PHP_METHOD(sqlite3stmt, execute) result->is_prepared_statement = 1; result->db_obj = stmt_obj->db_obj; result->stmt_obj = stmt_obj; - ZVAL_COPY(&result->stmt_obj_zval, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&result->stmt_obj_zval, Z_OBJ_P(object)); break; } @@ -1782,7 +1785,8 @@ PHP_METHOD(sqlite3stmt, __construct) } stmt_obj->db_obj = db_obj; - ZVAL_COPY(&stmt_obj->db_obj_zval, db_zval); + Z_ADDREF_P(db_zval); + ZVAL_OBJ(&stmt_obj->db_obj_zval, Z_OBJ_P(db_zval)); errcode = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL); if (errcode != SQLITE_OK) { @@ -1795,7 +1799,7 @@ PHP_METHOD(sqlite3stmt, __construct) free_item = emalloc(sizeof(php_sqlite3_free_list)); free_item->stmt_obj = stmt_obj; //?? free_item->stmt_obj_zval = ZEND_THIS; - ZVAL_COPY_VALUE(&free_item->stmt_obj_zval, object); + ZVAL_OBJ(&free_item->stmt_obj_zval, Z_OBJ_P(object)); zend_llist_add_element(&(db_obj->free_list), &free_item); } |