Getting rid of the old API parsing code.

6 files changed, 38 insertions, 39 deletions

diff --git a/ext/hwapi/hwapi.cpp b/ext/hwapi/hwapi.cpp
index b08f9ae598..6ebc07fb7c 100644
--- a/ext/hwapi/hwapi.cpp
+++ b/ext/hwapi/hwapi.cpp
@@ -4285,12 +4285,12 @@ PHP_FUNCTION(hwapi_object_attribute) {
 /* {{{ proto string hwapi_object_insert(object attr)
    Inserts new HW_API_Attribute into HW_API_Object */
 PHP_FUNCTION(hwapi_object_insert) {
-	zval *arg1, *id;
+	zval **arg1, *id;
 	HW_API_Object *objp;
 	HW_API_Attribute *attrp;
 	char *value;
 
-	if ((ZEND_NUM_ARGS() != 1) || getParameters(ht, 1, &arg1) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &arg1) == FAILURE)) {
 		WRONG_PARAM_COUNT;
 	}
 	id = getThis();
@@ -4298,7 +4298,7 @@ PHP_FUNCTION(hwapi_object_insert) {
 	if(!objp) {
 		RETURN_FALSE;
 	}
-	attrp = (HW_API_Attribute *) php_hwapi_get_object(arg1, le_hwapi_attributep);
+	attrp = (HW_API_Attribute *) php_hwapi_get_object(*arg1, le_hwapi_attributep);
 
 	objp->insert(*attrp);
 
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index 3cc3f16e7d..f893a3336a 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -2712,31 +2712,31 @@ PHP_FUNCTION(hw_insertdocument)
    Create a new document */
 PHP_FUNCTION(hw_new_document)
 {
-	pval *arg1, *arg2, *arg3;
+	zval **arg1, **arg2, **arg3;
 	char *ptr;
 	hw_document *doc;
 
-	if (ZEND_NUM_ARGS() != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 3 || (zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE)) {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_string(arg1);
-	convert_to_string(arg2);
-	convert_to_long(arg3);
+	convert_to_string_ex(arg1);
+	convert_to_string_ex(arg2);
+	convert_to_long_ex(arg3);
 
 	doc = malloc(sizeof(hw_document));
 	if(NULL == doc)
 		RETURN_FALSE;
-	doc->data = malloc(Z_LVAL_P(arg3)+1);
+	doc->data = malloc(Z_LVAL_PP(arg3)+1);
 	if(NULL == doc->data) {
 		free(doc);
 		RETURN_FALSE;
 	}
-	memcpy(doc->data, Z_STRVAL_P(arg2), Z_LVAL_P(arg3));
+	memcpy(doc->data, Z_STRVAL_PP(arg2), Z_LVAL_PP(arg3));
 	ptr = doc->data;
-	ptr[Z_LVAL_P(arg3)] = '\0';
-	doc->attributes = strdup(Z_STRVAL_P(arg1));
+	ptr[Z_LVAL_PP(arg3)] = '\0';
+	doc->attributes = strdup(Z_STRVAL_PP(arg1));
 	doc->bodytag = NULL;
-	doc->size = Z_LVAL_P(arg3);
+	doc->size = Z_LVAL_PP(arg3);
 	Z_LVAL_P(return_value) = zend_list_insert(doc, le_document);
 	Z_TYPE_P(return_value) = IS_LONG;
 }
diff --git a/ext/qtdom/qtdom.c b/ext/qtdom/qtdom.c
index 67dd51ea32..726b8bba23 100644
--- a/ext/qtdom/qtdom.c
+++ b/ext/qtdom/qtdom.c
@@ -209,7 +209,7 @@ static int qdom_find_children( zval **children, struct qdom_node *orig_node TSRM
    creates a tree of an xml string */
 PHP_FUNCTION(qdom_tree)
 {
-	zval *arg;
+	zval **arg;
     char qt_ver1[200];
     char *qt_ver = qt_ver1;
     char *qdom_type_name;
@@ -217,11 +217,10 @@ PHP_FUNCTION(qdom_tree)
     struct qdom_node *node;
     zval *children;
 
-	if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg) == FAILURE)
-    {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_string(arg);
+	convert_to_string_ex(arg);
 
     qdom_do_install_message_handler();
 
@@ -230,7 +229,7 @@ PHP_FUNCTION(qdom_tree)
     object_init_ex(return_value, qdomdoc_class_entry_ptr);
 	add_property_stringl(return_value, "version", (char *) qt_ver, strlen(qt_ver), 1);
 
-    doc = qdom_do_init( Z_STRVAL_P(arg) );
+    doc = qdom_do_init( Z_STRVAL_PP(arg) );
 
     qdom_do_doc_type( doc, &qdom_type_name );
 
diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp
index f507f3d2f3..46aa055f73 100644
--- a/ext/rpc/dotnet/dotnet.cpp
+++ b/ext/rpc/dotnet/dotnet.cpp
@@ -107,32 +107,32 @@ void dotnet_term() {
 PHP_FUNCTION(dotnet_load)
 {
 	HRESULT hr;
-	pval *assembly_name, *datatype_name, *code_page;
+	zval **assembly_name, **datatype_name, **code_page;
 	OLECHAR *assembly, *datatype;
 	comval *obj;
 
 	switch(ZEND_NUM_ARGS())
 	{
 		case 2:
-			getParameters(ht, 2, &assembly_name, &datatype_name);
+			zend_get_parameters_ex(2, &assembly_name, &datatype_name);
 			codepage = CP_ACP;
 			break;
 		case 3:
-			getParameters(ht, 3, &assembly_name, &datatype_name, &code_page);
+			zend_get_parameters_ex(3, &assembly_name, &datatype_name, &code_page);
 
-			convert_to_long(code_page);
-			codepage = Z_LVAL_P(code_page);
+			convert_to_long_ex(code_page);
+			codepage = Z_LVAL_PP(code_page);
 			break;
 		default:
 			WRONG_PARAM_COUNT;
 			break;
 	}
 
-	convert_to_string(assembly_name);
-	assembly = php_char_to_OLECHAR(Z_STRVAL_P(assembly_name), Z_STRLEN_P(assembly_name), codepage TSRMLS_CC);
+	convert_to_string_ex(assembly_name);
+	assembly = php_char_to_OLECHAR(Z_STRVAL_PP(assembly_name), Z_STRLEN_PP(assembly_name), codepage TSRMLS_CC);
 
-	convert_to_string(datatype_name);
-	datatype = php_char_to_OLECHAR(Z_STRVAL_P(datatype_name), Z_STRLEN_P(datatype_name), codepage TSRMLS_CC);
+	convert_to_string_ex(datatype_name);
+	datatype = php_char_to_OLECHAR(Z_STRVAL_PP(datatype_name), Z_STRLEN_PP(datatype_name), codepage TSRMLS_CC);
 
 	ALLOC_COM(obj);
 
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 5ae439a9b3..28e96c3971 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -438,9 +438,9 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
 
   int arg_count = ZEND_NUM_ARGS();
   jlong result = 0;
-  pval **arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
+	zval **arguments = (zval **) emalloc(sizeof(zval *)*arg_count);
 
-  getParametersArray(ht, arg_count, arguments);
+	zend_get_parameters_ex(arg_count, arguments);
 
   if (!JG(jenv)) jvm_create(TSRMLS_C);
   if (!JG(jenv)) return;
@@ -462,9 +462,9 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
       return;
     }
 
-    className=(*jenv)->NewStringUTF(jenv, Z_STRVAL_P(arguments[0]));
+    className=(*jenv)->NewStringUTF(jenv, Z_STRVAL_PP(arguments[0]));
     (*jenv)->CallVoidMethod(jenv, JG(php_reflect), co,
-      className, _java_makeArray(arg_count-1, arguments+1 TSRMLS_CC), result);
+      className, _java_makeArray(arg_count-1, *(arguments+1) TSRMLS_CC), result);
 
     (*jenv)->DeleteLocalRef(jenv, className);
 
@@ -485,7 +485,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
     result = (jlong)(long)return_value;
 
     (*jenv)->CallVoidMethod(jenv, JG(php_reflect), invoke,
-      obj, method, _java_makeArray(arg_count, arguments TSRMLS_CC), result);
+      obj, method, _java_makeArray(arg_count, *arguments TSRMLS_CC), result);
 
     (*jenv)->DeleteLocalRef(jenv, method);
 
diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c
index 3a70948255..b464caee05 100644
--- a/ext/snmp/winsnmp.c
+++ b/ext/snmp/winsnmp.c
@@ -76,17 +76,17 @@ void _php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) {
     AsnObjectIdentifier oid;
    char        *chkPtr = NULL;
 
-	if (getParameters(ht, 3, &a1, &a2, &a3) == FAILURE) {
+	if (zend_get_parameters_ex(3, &a1, &a2, &a3) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	convert_to_string(a1);
-	convert_to_string(a2);
-	convert_to_string(a3);
+	convert_to_string_ex(a1);
+	convert_to_string_ex(a2);
+	convert_to_string_ex(a3);
 
-	agent=Z_STRVAL_P(a1);
-	community=Z_STRVAL_P(a2);
+	agent=Z_STRVAL_PP(a1);
+	community=Z_STRVAL_PP(a2);
 	operation=st;
-	SnmpMgrStrToOid(Z_STRVAL_P(a3), &oid);
+	SnmpMgrStrToOid(Z_STRVAL_PP(a3), &oid);
 
 /* 
    I've limited this to only one oid, but we can create a