cvs: php4 /ext/com COM.c
| From: | Harald Radi | Date: | Tue, 14 Aug 2001 11:50:16 +0000 |
| Subject: | cvs: php4 /ext/com COM.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6835@lists.php.net to get a copy of this message | ||
phanto Tue Aug 14 07:50:16 2001 EDT
Modified files:
/php4/ext/com COM.c
Log:
fixed bug in com_load_typelib
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.46 php4/ext/com/COM.c:1.47
--- php4/ext/com/COM.c:1.46 Tue Aug 14 06:04:58 2001
+++ php4/ext/com/COM.c Tue Aug 14 07:50:15 2001
@@ -1084,13 +1084,13 @@
{
pval *arg_typelib, *arg_cis;
ITypeLib *pTL;
- int mode;
+ int mode = CONST_CS; /* CONST_PERSISTENT|CONST_CS; */
switch (ZEND_NUM_ARGS()) {
case 1:
zend_get_parameters(ht, 1, &arg_typelib);
- mode = CONST_CS; /* CONST_PERSISTENT|CONST_CS; */
break;
+
case 2:
zend_get_parameters(ht, 2, &arg_typelib, &arg_cis);
convert_to_boolean_ex(&arg_cis);
@@ -1098,6 +1098,7 @@
mode &= ~CONST_CS;
}
break;
+
default:
ZEND_WRONG_PARAM_COUNT();
}
@@ -1292,7 +1293,8 @@
int type;
if (zend_llist_count(property_reference->elements_list)==1
- && !strcmp(Z_STRVAL(function_name->element), "com")) { /* constructor */
+ && !strcmp(Z_STRVAL(function_name->element), "com")) {
+ /* constructor */
pval *object_handle;
PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);