cvs: php4 /ext/com COM.c
| From: | Wez Furlong | Date: | Tue, 21 May 2002 20:57:04 +0000 |
| Subject: | cvs: php4 /ext/com COM.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12046@lists.php.net to get a copy of this message | ||
wez Tue May 21 16:57:04 2002 EDT
Modified files:
/php4/ext/com COM.c
Log:
Correct usage of convert_to_string_ex which is not allowed to zval*
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.75 php4/ext/com/COM.c:1.76
--- php4/ext/com/COM.c:1.75 Tue May 21 16:51:30 2002
+++ php4/ext/com/COM.c Tue May 21 16:57:03 2002
@@ -1316,7 +1316,7 @@
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 @@
} 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 @@
}
/* }}} */
-
/* {{{ 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 @@
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 @@
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);
}