From 6cfba2a3ea0c59f63b8c225b2a0ff85194f432f5 Mon Sep 17 00:00:00 2001 From: Jeroen van Wolffelaar Date: Tue, 25 Sep 2001 22:49:04 +0000 Subject: 2nd phase in back-substitution those macro's I've got pretty much everything now... --- ext/oci8/oci8.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/oci8') diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index a871a6d281..458b0a9738 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2518,15 +2518,15 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu convert_to_string_ex(passParam); convert_to_string_ex(dbParam); - username = (*userParam)->value.str.val; - password = (*passParam)->value.str.val; - dbname = (*dbParam)->value.str.val; + username = Z_STRVAL_PP(userParam); + password = Z_STRVAL_PP(passParam); + dbname = Z_STRVAL_PP(dbParam); } else if (zend_get_parameters_ex(2, &userParam, &passParam) == SUCCESS) { convert_to_string_ex(userParam); convert_to_string_ex(passParam); - username = (*userParam)->value.str.val; - password = (*passParam)->value.str.val; + username = Z_STRVAL_PP(userParam); + password = Z_STRVAL_PP(passParam); dbname = ""; } else { WRONG_PARAM_COUNT; -- cgit v1.2.1