Correct usage of convert_to_string_ex which is not allowed to zval*

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 5e862866f731a08008f050d947128748492c2ad0..adde702b7118fdb117d00269dbe171e1965e275f 100644 (file)
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1316,7 +1316,7 @@ PHP_FUNCTION(com_print_typeinfo)
        comval *obj = NULL;
        ITypeInfo *typeinfo;
        
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zsb", &arg1, &ifacename,
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/sb", &arg1, &ifacename,
                                &ifacelen, &wantsink)) {
                RETURN_FALSE;
        }
@@ -1328,7 +1328,7 @@ PHP_FUNCTION(com_print_typeinfo)
        } else if (Z_TYPE_P(arg1) == IS_RESOURCE) {
                ZEND_FETCH_RESOURCE(obj, comval*, &arg1, -1, "comval", IS_COM);
        } else {
-               convert_to_string_ex(&arg1);
+               convert_to_string(arg1);
                typelibname = Z_STRVAL_P(arg1);
        }
 
@@ -1342,7 +1342,6 @@ PHP_FUNCTION(com_print_typeinfo)
 }
 /* }}} */
 
-
 /* {{{ proto bool com_event_sink(mixed comobject, object sinkobject [, mixed sinkinterface])
    Connect events from a COM object to a PHP object */
 PHP_FUNCTION(com_event_sink)
@@ -1355,7 +1354,7 @@ PHP_FUNCTION(com_event_sink)
 
        RETVAL_FALSE;
        
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z", &object, &sinkobject, &sink)) {
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z/", &object, &sinkobject, &sink)) {
                RETURN_FALSE;
        }
 
@@ -1376,7 +1375,7 @@ PHP_FUNCTION(com_event_sink)
                if (zend_hash_index_find(Z_ARRVAL_P(sink), 1, (void**)&tmp) == SUCCESS)
                        dispname = Z_STRVAL_PP(tmp);
        } else if (sink != NULL) {
-               convert_to_string_ex(&sink);
+               convert_to_string(sink);
                dispname = Z_STRVAL_P(sink);
        }
        

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 5e862866f731a08008f050d947128748492c2ad0..adde702b7118fdb117d00269dbe171e1965e275f 100644 (file)
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -1316,7 +1316,7 @@ PHP_FUNCTION(com_print_typeinfo)
        comval *obj = NULL;
        ITypeInfo *typeinfo;
        
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zsb", &arg1, &ifacename,
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/sb", &arg1, &ifacename,
                                &ifacelen, &wantsink)) {
                RETURN_FALSE;
        }
@@ -1328,7 +1328,7 @@ PHP_FUNCTION(com_print_typeinfo)
        } else if (Z_TYPE_P(arg1) == IS_RESOURCE) {
                ZEND_FETCH_RESOURCE(obj, comval*, &arg1, -1, "comval", IS_COM);
        } else {
-               convert_to_string_ex(&arg1);
+               convert_to_string(arg1);
                typelibname = Z_STRVAL_P(arg1);
        }
 
@@ -1342,7 +1342,6 @@ PHP_FUNCTION(com_print_typeinfo)
 }
 /* }}} */
 
-
 /* {{{ proto bool com_event_sink(mixed comobject, object sinkobject [, mixed sinkinterface])
    Connect events from a COM object to a PHP object */
 PHP_FUNCTION(com_event_sink)
@@ -1355,7 +1354,7 @@ PHP_FUNCTION(com_event_sink)
 
        RETVAL_FALSE;
        
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z", &object, &sinkobject, &sink)) {
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z/", &object, &sinkobject, &sink)) {
                RETURN_FALSE;
        }
 
@@ -1376,7 +1375,7 @@ PHP_FUNCTION(com_event_sink)
                if (zend_hash_index_find(Z_ARRVAL_P(sink), 1, (void**)&tmp) == SUCCESS)
                        dispname = Z_STRVAL_PP(tmp);
        } else if (sink != NULL) {
-               convert_to_string_ex(&sink);
+               convert_to_string(sink);
                dispname = Z_STRVAL_P(sink);
        }