Newer parameter parsing API.

1 files changed, 121 insertions, 125 deletions

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index bbb6c1a313..83fe5fbd2d 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -505,92 +505,92 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			strcpy(hashed_details, "sybase_____");
 			break;
 		case 1: {
-				zval *yyhost;
+				zval **yyhost;
 
-				if (getParameters(ht, 1, &yyhost)==FAILURE) {
+				if (zend_get_parameters_ex(1, &yyhost) == FAILURE) {
 					RETURN_FALSE;
 				}
-				convert_to_string(yyhost);
-				host = Z_STRVAL_P(yyhost);
+				convert_to_string_ex(yyhost);
+				host = Z_STRVAL_PP(yyhost);
 				user=passwd=charset=appname=NULL;
-				hashed_details_length = Z_STRLEN_P(yyhost)+6+5;
+				hashed_details_length = Z_STRLEN_PP(yyhost)+6+5;
 				hashed_details = (char *) emalloc(hashed_details_length+1);
-				sprintf(hashed_details, "sybase_%s____", Z_STRVAL_P(yyhost));
+				sprintf(hashed_details, "sybase_%s____", Z_STRVAL_PP(yyhost));
 			}
 			break;
 		case 2: {
-				zval *yyhost, *yyuser;
+				zval **yyhost, **yyuser;
 
-				if (getParameters(ht, 2, &yyhost, &yyuser)==FAILURE) {
+				if (zend_get_parameters_ex(2, &yyhost, &yyuser) == FAILURE) {
 					RETURN_FALSE;
 				}
-				convert_to_string(yyhost);
-				convert_to_string(yyuser);
-				host = Z_STRVAL_P(yyhost);
-				user = Z_STRVAL_P(yyuser);
+				convert_to_string_ex(yyhost);
+				convert_to_string_ex(yyuser);
+				host = Z_STRVAL_PP(yyhost);
+				user = Z_STRVAL_PP(yyuser);
 				passwd=charset=appname=NULL;
-				hashed_details_length = Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+6+5;
+				hashed_details_length = Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+6+5;
 				hashed_details = (char *) emalloc(hashed_details_length+1);
-				sprintf(hashed_details, "sybase_%s_%s___", Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser));
+				sprintf(hashed_details, "sybase_%s_%s___", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser));
 			}
 			break;
 		case 3: {
-				zval *yyhost, *yyuser, *yypasswd;
+				zval **yyhost, **yyuser, **yypasswd;
 
-				if (getParameters(ht, 3, &yyhost, &yyuser, &yypasswd) == FAILURE) {
+				if (zend_get_parameters_ex(3, &yyhost, &yyuser, &yypasswd) == FAILURE) {
 					RETURN_FALSE;
 				}
-				convert_to_string(yyhost);
-				convert_to_string(yyuser);
-				convert_to_string(yypasswd);
-				host = Z_STRVAL_P(yyhost);
-				user = Z_STRVAL_P(yyuser);
-				passwd = Z_STRVAL_P(yypasswd);
+				convert_to_string_ex(yyhost);
+				convert_to_string_ex(yyuser);
+				convert_to_string_ex(yypasswd);
+				host = Z_STRVAL_PP(yyhost);
+				user = Z_STRVAL_PP(yyuser);
+				passwd = Z_STRVAL_PP(yypasswd);
 				charset=appname=NULL;
-				hashed_details_length = Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+Z_STRLEN_P(yypasswd)+6+5;
+				hashed_details_length = Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+6+5;
 				hashed_details = (char *) emalloc(hashed_details_length+1);
-				sprintf(hashed_details, "sybase_%s_%s_%s__", Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser), Z_STRVAL_P(yypasswd));
+				sprintf(hashed_details, "sybase_%s_%s_%s__", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd));
 			}
 			break;
 		case 4: {
-				zval *yyhost, *yyuser, *yypasswd, *yycharset;
+				zval **yyhost, **yyuser, **yypasswd, **yycharset;
 
-				if (getParameters(ht, 4, &yyhost, &yyuser, &yypasswd, &yycharset) == FAILURE) {
+				if (zend_get_parameters_ex(4, &yyhost, &yyuser, &yypasswd, &yycharset) == FAILURE) {
 					RETURN_FALSE;
 				}
-				convert_to_string(yyhost);
-				convert_to_string(yyuser);
-				convert_to_string(yypasswd);
-				convert_to_string(yycharset);
-				host = Z_STRVAL_P(yyhost);
-				user = Z_STRVAL_P(yyuser);
-				passwd = Z_STRVAL_P(yypasswd);
-				charset = Z_STRVAL_P(yycharset);
+				convert_to_string_ex(yyhost);
+				convert_to_string_ex(yyuser);
+				convert_to_string_ex(yypasswd);
+				convert_to_string_ex(yycharset);
+				host = Z_STRVAL_PP(yyhost);
+				user = Z_STRVAL_PP(yyuser);
+				passwd = Z_STRVAL_PP(yypasswd);
+				charset = Z_STRVAL_PP(yycharset);
 				appname=NULL;
-				hashed_details_length = Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+Z_STRLEN_P(yypasswd)+Z_STRLEN_P(yycharset)+6+5;
+				hashed_details_length = Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+Z_STRLEN_PP(yycharset)+6+5;
 				hashed_details = (char *) emalloc(hashed_details_length+1);
-				sprintf(hashed_details, "sybase_%s_%s_%s_%s_", Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser), Z_STRVAL_P(yypasswd), Z_STRVAL_P(yycharset));
+				sprintf(hashed_details, "sybase_%s_%s_%s_%s_", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset));
 			}
 			break;
 		case 5: {
-				zval *yyhost, *yyuser, *yypasswd, *yycharset, *yyappname;
+				zval **yyhost, **yyuser, **yypasswd, **yycharset, **yyappname;
 
-				if (getParameters(ht, 5, &yyhost, &yyuser, &yypasswd, &yycharset, &yyappname) == FAILURE) {
+				if (zend_get_parameters_ex(5, &yyhost, &yyuser, &yypasswd, &yycharset, &yyappname) == FAILURE) {
 					RETURN_FALSE;
 				}
-				convert_to_string(yyhost);
-				convert_to_string(yyuser);
-				convert_to_string(yypasswd);
-				convert_to_string(yycharset);
-				convert_to_string(yyappname);
-				host = Z_STRVAL_P(yyhost);
-				user = Z_STRVAL_P(yyuser);
-				passwd = Z_STRVAL_P(yypasswd);
-				charset = Z_STRVAL_P(yycharset);
-				appname = Z_STRVAL_P(yyappname);
-				hashed_details_length = Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+Z_STRLEN_P(yypasswd)+Z_STRLEN_P(yycharset)+Z_STRLEN_P(yyappname)+6+5;
+				convert_to_string_ex(yyhost);
+				convert_to_string_ex(yyuser);
+				convert_to_string_ex(yypasswd);
+				convert_to_string_ex(yycharset);
+				convert_to_string_ex(yyappname);
+				host = Z_STRVAL_PP(yyhost);
+				user = Z_STRVAL_PP(yyuser);
+				passwd = Z_STRVAL_PP(yypasswd);
+				charset = Z_STRVAL_PP(yycharset);
+				appname = Z_STRVAL_PP(yyappname);
+				hashed_details_length = Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+Z_STRLEN_PP(yycharset)+Z_STRLEN_PP(yyappname)+6+5;
 				hashed_details = (char *) emalloc(hashed_details_length+1);
-				sprintf(hashed_details, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser), Z_STRVAL_P(yypasswd), Z_STRVAL_P(yycharset), Z_STRVAL_P(yyappname));
+				sprintf(hashed_details, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset), Z_STRVAL_PP(yyappname));
 			}
 			break;
 		default:
@@ -779,7 +779,7 @@ PHP_FUNCTION(sybase_pconnect)
    Close Sybase connection */
 PHP_FUNCTION(sybase_close)
 {
-	zval *sybase_link_index = 0;
+	zval **sybase_link_index = 0;
 	int id;
 	sybase_link *sybase_ptr;
 
@@ -788,7 +788,7 @@ PHP_FUNCTION(sybase_close)
 			id = SybCtG(default_link);
 			break;
 		case 1:
-			if (getParameters(ht, 1, &sybase_link_index)==FAILURE) {
+			if (zend_get_parameters_ex(1, &sybase_link_index) == FAILURE) {
 				RETURN_FALSE;
 			}
 			id = -1;
@@ -800,12 +800,11 @@ PHP_FUNCTION(sybase_close)
 
 	ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", le_link, le_plink);
 
-	if (id==-1) { /* explicit resource number */
+	if (id == -1) { /* explicit resource number */
 		zend_list_delete(Z_RESVAL_P(sybase_link_index));
 	}
 
-	if (id!=-1
-		|| (sybase_link_index && Z_RESVAL_P(sybase_link_index)==SybCtG(default_link))) {
+	if (id != -1 || (sybase_link_index && Z_RESVAL_PP(sybase_link_index)==SybCtG(default_link))) {
 		zend_list_delete(SybCtG(default_link));
 		SybCtG(default_link) = -1;
 	}
@@ -895,21 +894,21 @@ static int exec_cmd(sybase_link *sybase_ptr, char *cmdbuf)
    Select Sybase database */
 PHP_FUNCTION(sybase_select_db)
 {
-	zval *db, *sybase_link_index;
+	zval **db, **sybase_link_index;
 	int id;
 	char *cmdbuf;
 	sybase_link  *sybase_ptr;
 
 	switch(ZEND_NUM_ARGS()) {
 		case 1:
-			if (getParameters(ht, 1, &db)==FAILURE) {
+			if (zend_get_parameters_ex(1, &db) == FAILURE) {
 				RETURN_FALSE;
 			}
 			id = php_sybase_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 2:
-			if (getParameters(ht, 2, &db, &sybase_link_index)==FAILURE) {
+			if (zend_get_parameters_ex(2, &db, &sybase_link_index) == FAILURE) {
 				RETURN_FALSE;
 			}
 			id = -1;
@@ -919,11 +918,11 @@ PHP_FUNCTION(sybase_select_db)
 			break;
 	}
 
-	ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", le_link, le_plink);
+	ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, sybase_link_index, id, "Sybase-Link", le_link, le_plink);
 
-	convert_to_string(db);
-	cmdbuf = (char *) emalloc(sizeof("use ")+Z_STRLEN_P(db)+1);
-	sprintf(cmdbuf, "use %s", Z_STRVAL_P(db)); /* SAFE */
+	convert_to_string_ex(db);
+	cmdbuf = (char *) emalloc(sizeof("use ")+Z_STRLEN_PP(db)+1);
+	sprintf(cmdbuf, "use %s", Z_STRVAL_PP(db)); /* SAFE */
 
 	if (exec_cmd(sybase_ptr, cmdbuf)==FAILURE) {
 		efree(cmdbuf);
@@ -1489,19 +1488,18 @@ PHP_FUNCTION(sybase_unbuffered_query)
    Free result memory */
 PHP_FUNCTION(sybase_free_result)
 {
-	zval *sybase_result_index;
+	zval **sybase_result_index;
 	sybase_result *result;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
-	if (Z_TYPE_P(sybase_result_index)==IS_RESOURCE
-		&& Z_LVAL_P(sybase_result_index)==0) {
+	if (Z_TYPE_PP(sybase_result_index) == IS_RESOURCE && Z_LVAL_PP(sybase_result_index) == 0) {
 		RETURN_FALSE;
 	}
 
-	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+	ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 	
 	/* Did we fetch up until the end? */
 	if (result->last_retcode != CS_END_DATA) {
@@ -1510,7 +1508,7 @@ PHP_FUNCTION(sybase_free_result)
 		php_sybase_finish_results(result);
 	}
 	
-	zend_list_delete(Z_LVAL_P(sybase_result_index));
+	zend_list_delete(Z_LVAL_PP(sybase_result_index));
 	RETURN_TRUE;
 }
 
@@ -1528,14 +1526,14 @@ PHP_FUNCTION(sybase_get_last_message)
    Get number of rows in result */
 PHP_FUNCTION(sybase_num_rows)
 {
-	zval *sybase_result_index;
+	zval **sybase_result_index;
 	sybase_result *result;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
-	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+	ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
 	Z_LVAL_P(return_value) = result->num_rows;
 	Z_TYPE_P(return_value) = IS_LONG;
@@ -1547,14 +1545,14 @@ PHP_FUNCTION(sybase_num_rows)
    Get number of fields in result */
 PHP_FUNCTION(sybase_num_fields)
 {
-	zval *sybase_result_index;
+	zval **sybase_result_index;
 	sybase_result *result;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
-	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+	ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
 	Z_LVAL_P(return_value) = result->num_fields;
 	Z_TYPE_P(return_value) = IS_LONG;
@@ -1566,16 +1564,16 @@ PHP_FUNCTION(sybase_num_fields)
    Get row as enumerated array */
 PHP_FUNCTION(sybase_fetch_row)
 {
-	zval *sybase_result_index;
+	zval **sybase_result_index;
 	int i;
 	sybase_result *result;
 	zval *field_content;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
-	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+	ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
 	/* Unbuffered? */
 	if (result->last_retcode != CS_END_DATA) {
@@ -1602,17 +1600,17 @@ PHP_FUNCTION(sybase_fetch_row)
 
 static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int numerics)
 {
-	zval *sybase_result_index;
+	zval **sybase_result_index;
 	sybase_result *result;
 	int i, j;
 	zval *tmp;
 	char name[32];
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
-	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+	ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
 	/* Unbuffered ? Fetch next row */
 	if (result->last_retcode != CS_END_DATA) {
@@ -1624,9 +1622,7 @@ static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int numerics)
 		RETURN_FALSE;
 	}
 
-	if (array_init(return_value)==FAILURE) {
-		RETURN_FALSE;
-	}
+	array_init(return_value);
 	
 	j= 1;
 	for (i=0; i<result->num_fields; i++) {
@@ -1717,29 +1713,29 @@ PHP_FUNCTION(sybase_fetch_assoc)
    Move internal row pointer */
 PHP_FUNCTION(sybase_data_seek)
 {
-	zval *sybase_result_index, *offset;
+	zval **sybase_result_index, **offset;
 	sybase_result *result;
 
-	if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &sybase_result_index, &offset)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &sybase_result_index, &offset)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 
 	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
 
-	convert_to_long(offset);
+	convert_to_long_ex(offset);
 
 	/* Unbuffered ? */
-	if (result->last_retcode != CS_END_DATA && Z_LVAL_P(offset)>=result->num_rows) {
-		php_sybase_fetch_result_row(result, Z_LVAL_P(offset));
+	if (result->last_retcode != CS_END_DATA && Z_LVAL_PP(offset)>=result->num_rows) {
+		php_sybase_fetch_result_row(result, Z_LVAL_PP(offset));
 	}
 	
-	if (Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=result->num_rows) {
+	if (Z_LVAL_PP(offset)<0 || Z_LVAL_PP(offset)>=result->num_rows) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Bad row offset");
 		RETURN_FALSE;
 	}
 
-	result->cur_row = Z_LVAL_P(offset);
+	result->cur_row = Z_LVAL_PP(offset);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1798,17 +1794,17 @@ PHP_FUNCTION(sybase_fetch_field)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			if (getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+			if (zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
 				RETURN_FALSE;
 			}
 			field_offset=-1;
 			break;
 		case 2:
-			if (getParameters(ht, 2, &sybase_result_index, &offset)==FAILURE) {
+			if (zend_get_parameters_ex(2, &sybase_result_index, &offset) == FAILURE) {
 				RETURN_FALSE;
 			}
-			convert_to_long(offset);
-			field_offset = Z_LVAL_P(offset);
+			convert_to_long_ex(offset);
+			field_offset = Z_LVAL_PP(offset);
 			break;
 		default:
 			WRONG_PARAM_COUNT;
@@ -1845,18 +1841,18 @@ PHP_FUNCTION(sybase_fetch_field)
    Set field offset */
 PHP_FUNCTION(sybase_field_seek)
 {
-	zval *sybase_result_index, *offset;
+	zval **sybase_result_index, **offset;
 	int field_offset;
 	sybase_result *result;
 
-	if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &sybase_result_index, &offset)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=2 || zend_get_parameters_ex(2, &sybase_result_index, &offset) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
 
-	convert_to_long(offset);
-	field_offset = Z_LVAL_P(offset);
+	convert_to_long_ex(offset);
+	field_offset = Z_LVAL_PP(offset);
 	
 	/* Unbuffered ? */
 	if (result->last_retcode != CS_END_DATA && field_offset>=result->num_rows) {
@@ -1878,48 +1874,48 @@ PHP_FUNCTION(sybase_field_seek)
    Get result data */
 PHP_FUNCTION(sybase_result)
 {
-	zval *row, *field, *sybase_result_index;
+	zval **row, **field, **sybase_result_index;
 	int field_offset=0;
 	sybase_result *result;
 
-	if (ZEND_NUM_ARGS()!=3 || getParameters(ht, 3, &sybase_result_index, &row, &field)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=3 || zend_get_parameters_ex(3, &sybase_result_index, &row, &field)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 
 	ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
 
-	convert_to_long(row);
+	convert_to_long_ex(row);
 	
 	/* Unbuffered ? */
-	if (result->last_retcode != CS_END_DATA && Z_LVAL_P(row)>=result->num_rows) {
-		php_sybase_fetch_result_row(result, Z_LVAL_P(row));
+	if (result->last_retcode != CS_END_DATA && Z_LVAL_PP(row) >= result->num_rows) {
+		php_sybase_fetch_result_row(result, Z_LVAL_PP(row));
 	}
 
-	if (Z_LVAL_P(row)<0 || Z_LVAL_P(row)>=result->num_rows) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Bad row offset (%d)", Z_LVAL_P(row));
+	if (Z_LVAL_PP(row) < 0 || Z_LVAL_PP(row) >= result->num_rows) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Bad row offset (%d)", Z_LVAL_PP(row));
 		RETURN_FALSE;
 	}
 
-	switch(Z_TYPE_P(field)) {
+	switch(Z_TYPE_PP(field)) {
 		case IS_STRING: {
 			int i;
 
 			for (i=0; i<result->num_fields; i++) {
-				if (!strcasecmp(result->fields[i].name, Z_STRVAL_P(field))) {
+				if (!strcasecmp(result->fields[i].name, Z_STRVAL_PP(field))) {
 					field_offset = i;
 					break;
 				}
 			}
 			if (i>=result->num_fields) { /* no match found */
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  %s field not found in result", Z_STRVAL_P(field));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  %s field not found in result", Z_STRVAL_PP(field));
 				RETURN_FALSE;
 			}
 			break;
 		}
 		default:
-			convert_to_long(field);
-			field_offset = Z_LVAL_P(field);
+			convert_to_long_ex(field);
+			field_offset = Z_LVAL_PP(field);
 			if (field_offset<0 || field_offset>=result->num_fields) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Bad column offset specified");
 				RETURN_FALSE;
@@ -1927,7 +1923,7 @@ PHP_FUNCTION(sybase_result)
 			break;
 	}
 
-	*return_value = result->data[Z_LVAL_P(row)][field_offset];
+	*return_value = result->data[Z_LVAL_PP(row)][field_offset];
 	zval_copy_ctor(return_value);
 }
 /* }}} */
@@ -1937,7 +1933,7 @@ PHP_FUNCTION(sybase_result)
    Get number of affected rows in last query */
 PHP_FUNCTION(sybase_affected_rows)
 {
-	zval *sybase_link_index;
+	zval **sybase_link_index;
 	sybase_link *sybase_ptr;
 	int id;
 
@@ -1946,7 +1942,7 @@ PHP_FUNCTION(sybase_affected_rows)
 			id = php_sybase_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			break;
 		case 1:
-			if (getParameters(ht, 1, &sybase_link_index)==FAILURE) {
+			if (zend_get_parameters_ex(1, &sybase_link_index) == FAILURE) {
 				RETURN_FALSE;
 			}
 			id = -1;
@@ -1991,13 +1987,13 @@ PHP_MINFO_FUNCTION(sybase)
    Sets minimum client severity */
 PHP_FUNCTION(sybase_min_client_severity)
 {
-	zval *severity;
+	zval **severity;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &severity)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &severity) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_long(severity);
-	SybCtG(min_client_severity) = Z_LVAL_P(severity);
+	convert_to_long_ex(severity);
+	SybCtG(min_client_severity) = Z_LVAL_PP(severity);
 }
 /* }}} */
 
@@ -2006,13 +2002,13 @@ PHP_FUNCTION(sybase_min_client_severity)
    Sets minimum server severity */
 PHP_FUNCTION(sybase_min_server_severity)
 {
-	zval *severity;
+	zval **severity;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &severity)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &severity) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_long(severity);
-	SybCtG(min_server_severity) = Z_LVAL_P(severity);
+	convert_to_long_ex(severity);
+	SybCtG(min_server_severity) = Z_LVAL_PP(severity);
 }
 /* }}} */
 
@@ -2020,13 +2016,13 @@ PHP_FUNCTION(sybase_min_server_severity)
    Sets deadlock retry count */
 PHP_FUNCTION(sybase_deadlock_retry_count)
 {
-	zval *retry_count;
+	zval **retry_count;
 
-	if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &retry_count)==FAILURE) {
+	if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &retry_count) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_long(retry_count);
-	SybCtG(deadlock_retry_count) = Z_LVAL_P(retry_count);
+	convert_to_long_ex(retry_count);
+	SybCtG(deadlock_retry_count) = Z_LVAL_PP(retry_count);
 }
 /* }}} */