Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: dbx.c
- ===================================================================
- --- dbx.c (revision 288604)
- +++ dbx.c (working copy)
- @@ -52,6 +52,16 @@
- #include "dbx_sybasect.h"
- #include "dbx_sqlite.h"
- +#ifndef Z_ADDREF_P
- +# define Z_ADDREF_P(pz) (pz)->refcount++;
- +# define Z_ADDREF_PP(ppz) Z_ADDREF_P(*(ppz))
- +#endif
- +
- +#ifndef Z_SET_ISREF_P
- +# define Z_SET_ISREF_P(pz) (pz)->is_ref = 1;
- +# define Z_SET_ISREF_PP(ppz) Z_SET_ISREF_P(*(ppz))
- +#endif
- +
- /* support routines */
- int module_exists(char *module_name)
- {
- @@ -283,19 +293,19 @@
- if (Z_TYPE_PP(arguments[0]) == IS_LONG) {
- if (!module_identifier_exists(Z_LVAL_PP(arguments[0]))) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: module '%ld' not loaded or not supported.", Z_LVAL_PP(arguments[0]));
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: module '%ld' not loaded or not supported", Z_LVAL_PP(arguments[0]));
- return;
- }
- module_identifier = Z_LVAL_PP(arguments[0]);
- } else {
- convert_to_string_ex(arguments[0]);
- if (!module_exists(Z_STRVAL_PP(arguments[0]))) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: module '%s' not loaded.", Z_STRVAL_PP(arguments[0]));
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: module '%s' not loaded", Z_STRVAL_PP(arguments[0]));
- return;
- }
- module_identifier=get_module_identifier(Z_STRVAL_PP(arguments[0]));
- if (!module_identifier) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: unsupported module '%s'.", Z_STRVAL_PP(arguments[0]));
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: unsupported module '%s'", Z_STRVAL_PP(arguments[0]));
- return;
- }
- }
- @@ -349,7 +359,7 @@
- WRONG_PARAM_COUNT;
- }
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module, &dbx_database TSRMLS_CC)) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object...");
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object");
- RETURN_LONG(0);
- }
- @@ -401,7 +411,7 @@
- WRONG_PARAM_COUNT;
- }
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module, &dbx_database TSRMLS_CC)) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object...");
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object");
- RETURN_LONG(0);
- }
- /* default values */
- @@ -470,7 +480,7 @@
- ZVAL_LONG(rv_column_count, 0);
- result = switch_dbx_getcolumncount(&rv_column_count, &rv_result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU, dbx_module);
- if (!result) {
- - php_error_docref(NULL TSRMLS_CC, E_ERROR, "get column_count failed...");
- + php_error_docref(NULL TSRMLS_CC, E_ERROR, "get column_count failed");
- FREE_ZVAL(rv_column_count);
- RETURN_LONG(0);
- }
- @@ -532,8 +542,8 @@
- for (col_index=0; col_index<Z_LVAL_P(rv_column_count); ++col_index) {
- zend_hash_index_find(Z_ARRVAL_PP(inforow_ptr), col_index, (void **) &columnname_ptr);
- zend_hash_index_find(Z_ARRVAL_PP(row_ptr), col_index, (void **) &actual_ptr);
- - (*actual_ptr)->refcount+=1;
- - (*actual_ptr)->is_ref=1;
- + Z_ADDREF_PP(actual_ptr);
- + Z_SET_ISREF_PP(actual_ptr);
- zend_hash_update(Z_ARRVAL_PP(row_ptr), Z_STRVAL_PP(columnname_ptr), Z_STRLEN_PP(columnname_ptr) + 1, actual_ptr, sizeof(zval *), NULL);
- }
- }
- @@ -580,11 +590,11 @@
- WRONG_PARAM_COUNT;
- }
- if (!split_dbx_result_object(arguments[0], &dbx_result_link, &dbx_result_handle, &dbx_result_flags, &dbx_result_info, &dbx_result_cols, &dbx_result_rows TSRMLS_CC)) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_result-object...");
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_result-object");
- RETURN_LONG(0);
- }
- if (!split_dbx_handle_object(dbx_result_link, &dbx_handle, &dbx_module, &dbx_database TSRMLS_CC)) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object...");
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object");
- RETURN_LONG(0);
- }
- @@ -606,8 +616,8 @@
- for (col_index=0; col_index<col_count; ++col_index) {
- zend_hash_index_find(Z_ARRVAL_PP(inforow_ptr), col_index, (void **) &columnname_ptr);
- zend_hash_index_find(Z_ARRVAL_P(return_value), col_index, (void **) &actual_ptr);
- - (*actual_ptr)->refcount+=1;
- - (*actual_ptr)->is_ref=1;
- + Z_ADDREF_PP(actual_ptr);
- + Z_SET_ISREF_PP(actual_ptr);
- zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(columnname_ptr), Z_STRLEN_PP(columnname_ptr) + 1, actual_ptr, sizeof(zval *), NULL);
- }
- }
- @@ -636,7 +646,7 @@
- WRONG_PARAM_COUNT;
- }
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module, &dbx_database TSRMLS_CC)) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object...");
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object");
- RETURN_LONG(0);
- }
- @@ -669,7 +679,7 @@
- WRONG_PARAM_COUNT;
- }
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module, &dbx_database TSRMLS_CC)) {
- - php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object...");
- + php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid dbx_handle-object");
- RETURN_NULL();
- }
- convert_to_string_ex(arguments[1]);
- Index: dbx.h
- ===================================================================
- --- dbx.h (revision 288604)
- +++ dbx.h (working copy)
- @@ -29,6 +29,10 @@
- #include "zend_modules.h"
- #endif
- +#ifdef HAVE_CONFIG_H
- +# include "config.h"
- +#endif
- +
- #include "php.h"
- #include "ext/standard/php_string.h"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
