diff options
Diffstat (limited to 'ext/dbx/dbx_odbc.c')
| -rw-r--r-- | ext/dbx/dbx_odbc.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/ext/dbx/dbx_odbc.c b/ext/dbx/dbx_odbc.c index 3e4d0ef39a..ca5ad9ff5c 100644 --- a/ext/dbx/dbx_odbc.c +++ b/ext/dbx/dbx_odbc.c @@ -27,7 +27,7 @@ #define ODBC_NUM 2 int dbx_odbc_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns connection handle as resource on success or 0 as long on failure /*/ + /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; zval ** arguments[3]; zval * returned_zval=NULL; @@ -45,7 +45,7 @@ int dbx_odbc_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zva } int dbx_odbc_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns connection handle as resource on success or 0 as long on failure /*/ + /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; zval ** arguments[3]; zval * returned_zval=NULL; @@ -63,7 +63,7 @@ int dbx_odbc_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zv } int dbx_odbc_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns 1 as long on success or 0 as long on failure /*/ + /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; zval ** arguments[1]; zval * returned_zval=NULL; @@ -79,17 +79,17 @@ int dbx_odbc_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) } int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns 1 as long or a result identifier as resource on success or 0 as long on failure /*/ + /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; zval ** arguments[2]; zval * queryresult_zval=NULL; zval * num_fields_zval=NULL; - // db_name is not used in this function + /* db_name is not used in this function */ arguments[0]=dbx_handle; arguments[1]=sql_statement; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "odbc_exec", &queryresult_zval, number_of_arguments, arguments); - /*/ odbc_query returns a bool for failure, or a result_identifier for success /*/ + /* odbc_query returns a bool for failure, or a result_identifier for success */ if (!queryresult_zval || queryresult_zval->type!=IS_RESOURCE) { if (queryresult_zval) zval_ptr_dtor(&queryresult_zval); return 0; @@ -103,7 +103,7 @@ int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_ } if (num_fields_zval->value.lval==0) { (*rv)->type=IS_BOOL; - (*rv)->value.lval=1; /*/ success, but no data /*/ + (*rv)->value.lval=1; /* success, but no data */ FREE_ZVAL(num_fields_zval); if (queryresult_zval) zval_ptr_dtor(&queryresult_zval); return 1; @@ -114,7 +114,7 @@ int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_ } int dbx_odbc_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns column-count as long on success or 0 as long on failure /*/ + /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; zval ** arguments[1]; zval * returned_zval=NULL; @@ -130,7 +130,7 @@ int dbx_odbc_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION } int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns column-name as string on success or 0 as long on failure /*/ + /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; zval ** arguments[2]; zval * zval_column_index; @@ -141,7 +141,7 @@ int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, arguments[0]=result_handle; arguments[1]=&zval_column_index; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "odbc_field_name", &returned_zval, number_of_arguments, arguments); - /*/ odbc_field_name returns a string /*/ + /* odbc_field_name returns a string */ if (!returned_zval || returned_zval->type!=IS_STRING) { if (returned_zval) zval_ptr_dtor(&returned_zval); FREE_ZVAL(zval_column_index); @@ -153,7 +153,7 @@ int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, } int dbx_odbc_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns column-type as string on success or 0 as long on failure /*/ + /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; zval ** arguments[2]; zval * zval_column_index; @@ -164,19 +164,20 @@ int dbx_odbc_getcolumntype(zval ** rv, zval ** result_handle, long column_index, arguments[0]=result_handle; arguments[1]=&zval_column_index; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "odbc_field_type", &returned_zval, number_of_arguments, arguments); - /*/ odbc_field_name returns a string /*/ + /* odbc_field_name returns a string */ if (!returned_zval || returned_zval->type!=IS_STRING) { if (returned_zval) zval_ptr_dtor(&returned_zval); FREE_ZVAL(zval_column_index); return 0; } FREE_ZVAL(zval_column_index); + MOVE_RETURNED_TO_RV(rv, returned_zval); return 1; } int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns array[0..columncount-1] as strings on success or 0 as long on failure /*/ + /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments; zval ** arguments[2]; zval * num_fields_zval=NULL; @@ -187,7 +188,7 @@ int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL long field_index; long field_count=-1; - /*/ get # fields /*/ + /* get # fields */ MAKE_STD_ZVAL(num_fields_zval); ZVAL_LONG(num_fields_zval, 0); if (!dbx_odbc_getcolumncount(&num_fields_zval, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU)) { @@ -195,7 +196,7 @@ int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL } field_count=num_fields_zval->value.lval; FREE_ZVAL(num_fields_zval); - /*/ fetch row /*/ + /* fetch row */ number_of_arguments=1; arguments[0]=result_handle; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "odbc_fetch_row", &fetch_row_result_zval, number_of_arguments, arguments); @@ -205,12 +206,12 @@ int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL } if (fetch_row_result_zval->value.lval==0) { (*rv)->type=IS_LONG; - (*rv)->value.lval=0; /*/ ok, no more rows /*/ + (*rv)->value.lval=0; /* ok, no more rows */ zval_ptr_dtor(&fetch_row_result_zval); return 0; } zval_ptr_dtor(&fetch_row_result_zval); - /*/ fill array with field results... /*/ + /* fill array with field results... */ MAKE_STD_ZVAL(returned_zval); if (array_init(returned_zval) != SUCCESS) { zend_error(E_ERROR, "dbx_odbc_getrow: unable to create result-array..."); @@ -234,7 +235,7 @@ int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL } int dbx_odbc_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { - /*/ returns empty string, no equivalent in odbc module (yet???) /*/ + /* returns empty string, no equivalent in odbc module (yet???) */ ZVAL_EMPTY_STRING((*rv)); return 1; } |