archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros

Browse source
This commit is contained in:
Dmitry Stogov 2019-05-28 20:10:02 +03:00
parent 071b389bc6
commit 83804519df
29 changed files with 102 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/sqlite3/sqlite3.c
View file

@ -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);
}