diff options
Diffstat (limited to 'ext/dbx/dbx_fbsql.c')
| -rw-r--r-- | ext/dbx/dbx_fbsql.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ext/dbx/dbx_fbsql.c b/ext/dbx/dbx_fbsql.c index edc7b5586e..f1d16386c2 100644 --- a/ext/dbx/dbx_fbsql.c +++ b/ext/dbx/dbx_fbsql.c @@ -41,7 +41,7 @@ int dbx_fbsql_connect(zval **rv, zval **host, zval **db, zval **username, zval * arguments[1]=username; arguments[2]=password; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_connect", &returned_zval, number_of_arguments, arguments); - if (!returned_zval || returned_zval->type!=IS_RESOURCE) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_RESOURCE) { if (returned_zval) zval_ptr_dtor(&returned_zval); return 0; } @@ -50,12 +50,12 @@ int dbx_fbsql_connect(zval **rv, zval **host, zval **db, zval **username, zval * arguments[0]=db; arguments[1]=&returned_zval; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_select_db", &select_db_zval, number_of_arguments, arguments); - if (!select_db_zval || (select_db_zval->type==IS_BOOL && select_db_zval->value.lval==0) ) { + if (!select_db_zval || (Z_TYPE_P(select_db_zval)==IS_BOOL && Z_LVAL_P(select_db_zval)==0) ) { if (select_db_zval) zval_ptr_dtor(&select_db_zval); /* also close connection */ number_of_arguments=1; arguments[0]=&returned_zval; - zend_list_addref(returned_zval->value.lval); + zend_list_addref(Z_LVAL_P(returned_zval)); dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_close", &select_db_zval, number_of_arguments, arguments); if (select_db_zval) zval_ptr_dtor(&select_db_zval); zval_ptr_dtor(&returned_zval); @@ -79,7 +79,7 @@ int dbx_fbsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval arguments[1]=username; arguments[2]=password; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_pconnect", &returned_zval, number_of_arguments, arguments); - if (!returned_zval || returned_zval->type!=IS_RESOURCE) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_RESOURCE) { if (returned_zval) zval_ptr_dtor(&returned_zval); return 0; } @@ -88,12 +88,12 @@ int dbx_fbsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval arguments[0]=db; arguments[1]=&returned_zval; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_select_db", &select_db_zval, number_of_arguments, arguments); - if (!select_db_zval || (select_db_zval->type==IS_BOOL && select_db_zval->value.lval==0) ) { + if (!select_db_zval || (Z_TYPE_P(select_db_zval)==IS_BOOL && Z_LVAL_P(select_db_zval)==0) ) { if (select_db_zval) zval_ptr_dtor(&select_db_zval); /* also close connection */ number_of_arguments=1; arguments[0]=&returned_zval; - zend_list_addref(returned_zval->value.lval); + zend_list_addref(Z_LVAL_P(returned_zval)); dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_close", &select_db_zval, number_of_arguments, arguments); if (select_db_zval) zval_ptr_dtor(&select_db_zval); zval_ptr_dtor(&returned_zval); @@ -114,7 +114,7 @@ int dbx_fbsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) arguments[0]=dbx_handle; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_close", &returned_zval, number_of_arguments, arguments); - if (!returned_zval || returned_zval->type!=IS_BOOL) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_BOOL) { if (returned_zval) zval_ptr_dtor(&returned_zval); return 0; } @@ -134,7 +134,7 @@ int dbx_fbsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_sta arguments[2]=dbx_handle; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_db_query", &returned_zval, number_of_arguments, arguments); /* fbsql_query returns a bool for success or failure, or a result_identifier for select statements */ - if (!returned_zval || (returned_zval->type!=IS_BOOL && returned_zval->type!=IS_RESOURCE)) { + if (!returned_zval || (Z_TYPE_P(returned_zval)!=IS_BOOL && Z_TYPE_P(returned_zval)!=IS_RESOURCE)) { if (returned_zval) zval_ptr_dtor(&returned_zval); return 0; } @@ -151,7 +151,7 @@ int dbx_fbsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_ arguments[0]=result_handle; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_num_fields", &returned_zval, number_of_arguments, arguments); - if (!returned_zval || returned_zval->type!=IS_LONG) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_LONG) { if (returned_zval) zval_ptr_dtor(&returned_zval); return 0; } @@ -173,7 +173,7 @@ int dbx_fbsql_getcolumnname(zval **rv, zval **result_handle, long column_index, arguments[1]=&zval_column_index; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_field_name", &returned_zval, number_of_arguments, arguments); /* fbsql_field_name returns a string */ - if (!returned_zval || returned_zval->type!=IS_STRING) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_STRING) { if (returned_zval) zval_ptr_dtor(&returned_zval); FREE_ZVAL(zval_column_index); return 0; @@ -197,7 +197,7 @@ int dbx_fbsql_getcolumntype(zval **rv, zval **result_handle, long column_index, arguments[1]=&zval_column_index; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_field_type", &returned_zval, number_of_arguments, arguments); /* fbsql_field_name returns a string */ - if (!returned_zval || returned_zval->type!=IS_STRING) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_STRING) { if (returned_zval) zval_ptr_dtor(&returned_zval); FREE_ZVAL(zval_column_index); return 0; @@ -221,7 +221,7 @@ int dbx_fbsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_ arguments[0]=result_handle; arguments[1]=&zval_resulttype; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_fetch_array", &returned_zval, number_of_arguments, arguments); - if (!returned_zval || returned_zval->type!=IS_ARRAY) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_ARRAY) { if (returned_zval) zval_ptr_dtor(&returned_zval); FREE_ZVAL(zval_resulttype); return 0; @@ -241,7 +241,7 @@ int dbx_fbsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) arguments[0]=dbx_handle; if (!dbx_handle) number_of_arguments=0; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "fbsql_error", &returned_zval, number_of_arguments, arguments); - if (!returned_zval || returned_zval->type!=IS_STRING) { + if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_STRING) { if (returned_zval) zval_ptr_dtor(&returned_zval); return 0; } |