cvs: php4 /ext/com conversion.c
| From: | Harald Radi | Date: | Thu, 18 Apr 2002 10:05:50 +0000 |
| Subject: | cvs: php4 /ext/com conversion.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11188@lists.php.net to get a copy of this message | ||
phanto Thu Apr 18 06:05:50 2002 EDT
Modified files:
/php4/ext/com conversion.c
Log:
whitespace fixes
Index: php4/ext/com/conversion.c
diff -u php4/ext/com/conversion.c:1.43 php4/ext/com/conversion.c:1.44
--- php4/ext/com/conversion.c:1.43 Wed Apr 17 21:52:06 2002
+++ php4/ext/com/conversion.c Thu Apr 18 06:05:46 2002
@@ -380,8 +380,7 @@
/*
should be, but isn't :)
- if (V_VT(var_arg) != (VT_VARIANT|VT_BYREF))
- {
+ if (V_VT(var_arg) != (VT_VARIANT|VT_BYREF)) {
VariantInit(var_arg);
}
*/
@@ -631,31 +630,20 @@
break;
case VT_BSTR:
- if (V_ISBYREF(var_arg))
- {
- if (*V_BSTR(var_arg))
- {
+ Z_TYPE_P(pval_arg) = IS_STRING;
+
+ if (V_ISBYREF(var_arg)) {
+ if (*V_BSTR(var_arg)) {
Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(pval_arg),
codepage TSRMLS_CC);
- Z_TYPE_P(pval_arg) = IS_STRING;
- }
- else
- {
+ } else {
ZVAL_NULL(pval_arg);
- Z_TYPE_P(pval_arg) = IS_NULL;
}
efree(V_BSTRREF(var_arg));
- }
- else
- {
- if (V_BSTR(var_arg))
- {
+ } else {
+ if (V_BSTR(var_arg)) {
Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(pval_arg),
codepage TSRMLS_CC);
- Z_TYPE_P(pval_arg) = IS_STRING;
- }
- else
- {
+ } else {
ZVAL_NULL(pval_arg);
- Z_TYPE_P(pval_arg) = IS_NULL;
}
}
@@ -699,8 +687,7 @@
hr = V_UNKNOWN(var_arg)->lpVtbl->QueryInterface(var_arg->punkVal, &IID_IDispatch,
&V_DISPATCH(var_arg));
- if (FAILED(hr))
- {
+ if (FAILED(hr)) {
char *error_message;
error_message = php_COM_error_message(hr TSRMLS_CC);