diff options
| author | Andrey Hristov <andrey@php.net> | 2011-10-25 23:01:49 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-10-25 23:01:49 +0000 |
| commit | 845d8fa10c30f68acf425e20a69d3f33fc565e41 (patch) | |
| tree | de8a39dbc4aad0c5cd72cf687de48929132dac80 /ext/mysqli/mysqli_prop.c | |
| parent | 5e8bcbb08ac9b63ec33a69638ea6517a05a66bb6 (diff) | |
| download | php-git-845d8fa10c30f68acf425e20a69d3f33fc565e41.tar.gz | |
Move from directly referencing an aggregated structure to using a
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
Diffstat (limited to 'ext/mysqli/mysqli_prop.c')
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 709cb61308..2c6309dbcf 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -13,6 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Georg Richter <georg@php.net> | + | Andrey Hristov <andrey@php.net> | +----------------------------------------------------------------------+ $Id$ @@ -204,12 +205,12 @@ static int link_error_list_read(mysqli_object *obj, zval **retval TSRMLS_DC) array_init(*retval); if (mysql) { #if defined(MYSQLI_USE_MYSQLND) - if (mysql->mysql->error_info.error_list) { + if (mysql->mysql->error_info->error_list) { MYSQLND_ERROR_LIST_ELEMENT * message; zend_llist_position pos; - for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(mysql->mysql->error_info.error_list, &pos); + for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(mysql->mysql->error_info->error_list, &pos); message; - message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->error_info.error_list, &pos)) + message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->error_info->error_list, &pos)) { zval * single_error; MAKE_STD_ZVAL(single_error); @@ -397,12 +398,12 @@ static int stmt_error_list_read(mysqli_object *obj, zval **retval TSRMLS_DC) array_init(*retval); if (stmt && stmt->stmt) { #if defined(MYSQLI_USE_MYSQLND) - if (stmt->stmt->data && stmt->stmt->data->error_info.error_list) { + if (stmt->stmt->data && stmt->stmt->data->error_info->error_list) { MYSQLND_ERROR_LIST_ELEMENT * message; zend_llist_position pos; - for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(stmt->stmt->data->error_info.error_list, &pos); + for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(stmt->stmt->data->error_info->error_list, &pos); message; - message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info.error_list, &pos)) + message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info->error_list, &pos)) { zval * single_error; MAKE_STD_ZVAL(single_error); |