Skip to content

Commit bc8703d

Browse files
GirgiasGirgias
committed
Use standard bool/zend_result instead of int
1 parent 9409c8f commit bc8703d

File tree

7 files changed

+34
-39
lines changed

7 files changed

+34
-39
lines changed

‎ext/com_dotnet/com_com.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ PHP_FUNCTION(com_get_active_object)
331331
/* Performs an Invoke on the given com object.
332332
* returns a failure code and creates an exception if there was an error */
333333
HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
334-
WORD flags, DISPPARAMS *disp_params, VARIANT *v, int silent, int allow_noarg)
334+
WORD flags, DISPPARAMS *disp_params, VARIANT *v, bool silent, bool allow_noarg)
335335
{
336336
HRESULT hr;
337337
unsigned int arg_err;
@@ -340,7 +340,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
340340
hr = IDispatch_Invoke(V_DISPATCH(&obj->v), id_member,
341341
&IID_NULL, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), flags, disp_params, v, &e, &arg_err);
342342

343-
if (silent == 0 && FAILED(hr)) {
343+
if (!silent && FAILED(hr)) {
344344
char *desc = NULL, *msg = NULL;
345345

346346
switch (hr) {
@@ -382,7 +382,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
382382
break;
383383

384384
case DISP_E_BADPARAMCOUNT:
385-
if ((disp_params->cArgs + disp_params->cNamedArgs == 0) && (allow_noarg == 1)) {
385+
if ((disp_params->cArgs + disp_params->cNamedArgs == 0) && allow_noarg) {
386386
/* if getting a property and they are missing all parameters,
387387
* we want to create a proxy object for them; so lets not create an
388388
* exception here */
@@ -454,7 +454,7 @@ HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, zend_string *name,
454454
}
455455

456456
/* the core of COM */
457-
int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f,
457+
zend_result php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f,
458458
WORD flags, VARIANT *v, int nargs, zval *args)
459459
{
460460
DISPID dispid, altdispid;
@@ -582,8 +582,8 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *
582582

583583

584584

585-
int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid,
586-
WORD flags, VARIANT *v, int nargs, zval *args, int silent, int allow_noarg)
585+
zend_result php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid,
586+
WORD flags, VARIANT *v, int nargs, zval *args, bool silent, bool allow_noarg)
587587
{
588588
DISPID altdispid;
589589
DISPPARAMS disp_params;
@@ -718,7 +718,7 @@ PHP_FUNCTION(com_event_sink)
718718
obj->sink_dispatch = php_com_wrapper_export_as_sink(sinkobject, &obj->sink_id, id_to_name);
719719

720720
/* Now hook it up to the source */
721-
php_com_object_enable_event_sink(obj, TRUE);
721+
php_com_object_enable_event_sink(obj, /* enable */ true);
722722
RETVAL_TRUE;
723723

724724
} else {

‎ext/com_dotnet/com_handlers.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static PHP_FUNCTION(com_method_handler)
254254
php_com_dotnet_object *obj = CDNO_FETCH(object);
255255
int nargs;
256256
VARIANT v;
257-
int ret = FAILURE;
257+
zend_result ret = FAILURE;
258258

259259
if (V_VT(&obj->v) != VT_DISPATCH) {
260260
goto exit;
@@ -270,8 +270,7 @@ static PHP_FUNCTION(com_method_handler)
270270
VariantInit(&v);
271271

272272
if (SUCCESS == php_com_do_invoke_byref(obj, (zend_internal_function*)EX(func), DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v, nargs, args)) {
273-
php_com_zval_from_variant(return_value, &v, obj->code_page);
274-
ret = SUCCESS;
273+
ret = php_com_zval_from_variant(return_value, &v, obj->code_page);
275274
VariantClear(&v);
276275
}
277276

@@ -534,7 +533,7 @@ zend_object_handlers php_com_object_handlers = {
534533
NULL, /* get_properties_for */
535534
};
536535

537-
void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable)
536+
void php_com_object_enable_event_sink(php_com_dotnet_object *obj, bool enable)
538537
{
539538
if (obj->sink_dispatch) {
540539
IConnectionPointContainer *cont;
@@ -568,7 +567,7 @@ void php_com_object_free_storage(zend_object *object)
568567
}
569568

570569
if (obj->sink_dispatch) {
571-
php_com_object_enable_event_sink(obj, FALSE);
570+
php_com_object_enable_event_sink(obj, /* enable */ false);
572571
IDispatch_Release(obj->sink_dispatch);
573572
obj->sink_dispatch = NULL;
574573
}

‎ext/com_dotnet/com_iterator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void com_iter_move_forwards(zend_object_iterator *iter)
108108
return;
109109
}
110110
I->key++;
111-
if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key) == 0) {
111+
if (!php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key)) {
112112
I->key = (zend_ulong)-1;
113113
return;
114114
}

‎ext/com_dotnet/com_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
9191

9292
/* this is a convenience function for fetching a particular
9393
* element from a (possibly multi-dimensional) safe array */
94-
PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1)
94+
PHP_COM_DOTNET_API bool php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1)
9595
{
9696
UINT dims;
9797
LONG lbound, ubound;

‎ext/com_dotnet/com_typeinfo.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codep
176176
}
177177

178178
/* Given a type-library, merge it into the current engine state */
179-
PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage)
179+
PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, int codepage)
180180
{
181181
int i, j, interfaces;
182182
TYPEKIND pTKind;
@@ -475,18 +475,17 @@ static zend_string *php_com_string_from_clsid(const CLSID *clsid, int codepage)
475475
}
476476

477477

478-
int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage)
478+
bool php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, bool printdef, GUID *guid, int codepage)
479479
{
480480
TYPEATTR *attr;
481481
FUNCDESC *func;
482482
int i;
483483
OLECHAR *olename;
484484
zend_string *ansi_name = NULL;
485-
int ret = 0;
486485
DISPID lastid = 0; /* for props */
487486

488487
if (FAILED(ITypeInfo_GetTypeAttr(typeinfo, &attr))) {
489-
return 0;
488+
return false;
490489
}
491490

492491
/* verify that it is suitable */
@@ -637,13 +636,11 @@ int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int pri
637636
if (printdef) {
638637
php_printf("}\n");
639638
}
640-
641-
ret = 1;
642639
} else {
643640
zend_throw_error(NULL, "Type kind must be dispatchable, %08x given", attr->typekind);
644641
}
645642

646643
ITypeInfo_ReleaseTypeAttr(typeinfo, attr);
647644

648-
return ret;
645+
return true;
649646
}

‎ext/com_dotnet/com_variant.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
172172
}
173173
}
174174

175-
PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage)
175+
PHP_COM_DOTNET_API zend_result php_com_zval_from_variant(zval *z, VARIANT *v, int codepage)
176176
{
177177
OLECHAR *olestring = NULL;
178-
int ret = SUCCESS;
178+
zend_result ret = SUCCESS;
179179

180180
switch (V_VT(v)) {
181181
case VT_EMPTY:
@@ -271,9 +271,9 @@ PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepa
271271
}
272272

273273

274-
PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar)
274+
PHP_COM_DOTNET_API zend_result php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar)
275275
{
276-
int ret = SUCCESS;
276+
zend_result ret = SUCCESS;
277277

278278
switch (V_VT(dstvar) & ~VT_BYREF) {
279279
case VT_EMPTY:
@@ -510,7 +510,7 @@ PHP_FUNCTION(variant_set)
510510
obj->typeinfo = NULL;
511511
}
512512
if (obj->sink_dispatch) {
513-
php_com_object_enable_event_sink(obj, FALSE);
513+
php_com_object_enable_event_sink(obj, /* enable */ false);
514514
IDispatch_Release(obj->sink_dispatch);
515515
obj->sink_dispatch = NULL;
516516
}

‎ext/com_dotnet/php_com_dotnet_internal.h

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typedef struct _php_com_dotnet_object {
2929
zend_object zo;
3030

3131
VARIANT v;
32-
int modified;
32+
bool modified;
3333

3434
int code_page;
3535

@@ -48,7 +48,7 @@ typedef struct _php_com_dotnet_object {
4848
HashTable *id_of_name_cache;
4949
} php_com_dotnet_object;
5050

51-
static inline int php_com_is_valid_object(zval *zv)
51+
static inline bool php_com_is_valid_object(zval *zv)
5252
{
5353
zend_class_entry *ce = Z_OBJCE_P(zv);
5454
return zend_string_equals_literal(ce->name, "com") ||
@@ -73,7 +73,7 @@ zend_object* php_com_object_new(zend_class_entry *ce);
7373
zend_object* php_com_object_clone(zend_object *object);
7474
void php_com_object_free_storage(zend_object *object);
7575
zend_object_handlers php_com_object_handlers;
76-
void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable);
76+
void php_com_object_enable_event_sink(php_com_dotnet_object *obj, bool enable);
7777

7878
/* com_saproxy.c */
7979
zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object, int by_ref);
@@ -91,14 +91,14 @@ zend_string *php_com_bstr_to_string(BSTR bstr, int codepage);
9191
PHP_METHOD(com, __construct);
9292

9393
HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
94-
WORD flags, DISPPARAMS *disp_params, VARIANT *v, int silent, int allow_noarg);
94+
WORD flags, DISPPARAMS *disp_params, VARIANT *v, bool silent, bool allow_noarg);
9595
HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, zend_string *name,
9696
DISPID *dispid);
97-
int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid,
98-
WORD flags, VARIANT *v, int nargs, zval *args, int silent, int allow_noarg);
97+
zend_result php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid,
98+
WORD flags, VARIANT *v, int nargs, zval *args, bool silent, bool allow_noarg);
9999
zend_result php_com_do_invoke(php_com_dotnet_object *obj, zend_string *name,
100100
WORD flags, VARIANT *v, int nargs, zval *args, bool allow_noarg);
101-
int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f,
101+
zend_result php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f,
102102
WORD flags, VARIANT *v, int nargs, zval *args);
103103

104104
/* com_wrapper.c */
@@ -114,8 +114,8 @@ PHP_METHOD(variant, __construct);
114114

115115
PHP_COM_DOTNET_API void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage);
116116
PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage);
117-
PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage);
118-
PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dst, VARIANT *src);
117+
PHP_COM_DOTNET_API zend_result php_com_zval_from_variant(zval *z, VARIANT *v, int codepage);
118+
PHP_COM_DOTNET_API zend_result php_com_copy_variant(VARIANT *dst, VARIANT *src);
119119

120120
/* com_dotnet.c */
121121
PHP_METHOD(dotnet, __construct);
@@ -128,16 +128,15 @@ PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
128128
int codepage);
129129
PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
130130
int codepage);
131-
PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1);
131+
PHP_COM_DOTNET_API bool php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1);
132132

133133
/* com_typeinfo.c */
134134
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(const char *search_string, int codepage);
135135
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage);
136-
PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode,
137-
int codepage);
136+
PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, int codepage);
138137
void php_com_typelibrary_dtor(zval *pDest);
139138
ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink);
140-
int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage);
139+
bool php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, bool printdef, GUID *guid, int codepage);
141140
ITypeLib *php_com_cache_typelib(ITypeLib* TL, char *cache_key, zend_long cache_key_len);
142141
PHP_MINIT_FUNCTION(com_typeinfo);
143142
PHP_MSHUTDOWN_FUNCTION(com_typeinfo);

0 commit comments

Comments
 (0)