cvs: php4 /ext/dbx dbx.c
| From: | Marc Boeren | Date: | Mon, 07 May 2001 14:49:06 +0000 |
| Subject: | cvs: php4 /ext/dbx dbx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5587@lists.php.net to get a copy of this message | ||
mboeren Mon May 7 07:49:06 2001 EDT
Modified files:
/php4/ext/dbx dbx.c
Log:
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 :)
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.11 php4/ext/dbx/dbx.c:1.12
--- php4/ext/dbx/dbx.c:1.11 Fri May 4 02:42:45 2001
+++ php4/ext/dbx/dbx.c Mon May 7 07:49:05 2001
@@ -64,7 +64,6 @@
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 @@
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);