summaryrefslogtreecommitdiff
path: root/ext/dbx
diff options
context:
space:
mode:
authorMarc Boeren <mboeren@php.net>2001-05-07 14:49:05 +0000
committerMarc Boeren <mboeren@php.net>2001-05-07 14:49:05 +0000
commita7bff5d8f1f04bef9ff35cb59fcb7b0a6e1d80cd (patch)
tree16430f9502f94cfd570b7ca5076334558d98c42d /ext/dbx
parent156a461117b3e77c35d9300c2c6e78cda8083423 (diff)
downloadphp-git-a7bff5d8f1f04bef9ff35cb59fcb7b0a6e1d80cd.tar.gz
Passed db_handle to dbx_error_function instead of NULL (Mc)
# I don't know why it worked on my machine, but now it works # because the code is right, not through magic :)
Diffstat (limited to 'ext/dbx')
-rw-r--r--ext/dbx/dbx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c
index 8762e6cf60..662433aedc 100644
--- a/ext/dbx/dbx.c
+++ b/ext/dbx/dbx.c
@@ -64,7 +64,6 @@ int get_module_identifier(char * module_name) {
return DBX_UNKNOWN;
}
-
int split_dbx_handle_object(zval ** dbx_object, zval *** pdbx_handle, zval *** pdbx_module, zval *** pdbx_database) {
convert_to_object_ex(dbx_object);
if (zend_hash_find((*dbx_object)->value.obj.properties, "handle", 7, (void **) pdbx_handle)==FAILURE
@@ -509,7 +508,7 @@ ZEND_FUNCTION(dbx_error)
MAKE_STD_ZVAL(rv_errormsg);
ZVAL_LONG(rv_errormsg, 0);
- result = switch_dbx_error(&rv_errormsg, NULL, INTERNAL_FUNCTION_PARAM_PASSTHRU, dbx_module);
+ result = switch_dbx_error(&rv_errormsg, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU, dbx_module);
if (!result) {
FREE_ZVAL(rv_errormsg);
RETURN_STRING("", 1);