Skip to content

Drop superfluous php_com_dotnet_object.ce #17603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Drop superfluous php_com_dotnet_object.ce #17603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0836e5
Drop superfluous php_com_dotnet_object.ce
cmb69 Jan 27, 2025
adebef9
Drop further superfluous assignments
cmb69 Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ext/com_dotnet/com_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ static zend_function *com_method_get(zend_object **object_ptr, zend_string *name
f.type = ZEND_INTERNAL_FUNCTION;
f.num_args = 0;
f.arg_info = NULL;
f.scope = obj->ce;
f.scope = obj->zo.ce;
f.fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
f.function_name = zend_string_copy(name);
f.handler = PHP_FN(com_method_handler);
Expand Down Expand Up @@ -392,7 +392,7 @@ static zend_string* com_class_name_get(const zend_object *object)
{
php_com_dotnet_object *obj = (php_com_dotnet_object *)object;

return zend_string_copy(obj->ce->name);
return zend_string_copy(obj->zo.ce->name);
}

/* This compares two variants for equality */
Expand Down Expand Up @@ -625,7 +625,6 @@ zend_object* php_com_object_new(zend_class_entry *ce)

VariantInit(&obj->v);
obj->code_page = CP_ACP;
obj->ce = ce;

zend_object_std_init(&obj->zo, ce);

Expand Down
4 changes: 0 additions & 4 deletions ext/com_dotnet/com_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
obj = emalloc(sizeof(*obj));
memset(obj, 0, sizeof(*obj));
obj->code_page = codepage;
obj->ce = php_com_variant_class_entry;
obj->zo.ce = php_com_variant_class_entry;

VariantInit(&obj->v);
V_VT(&obj->v) = VT_DISPATCH;
Expand All @@ -72,8 +70,6 @@ PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
obj = emalloc(sizeof(*obj));
memset(obj, 0, sizeof(*obj));
obj->code_page = codepage;
obj->ce = php_com_variant_class_entry;
obj->zo.ce = php_com_variant_class_entry;

VariantInit(&obj->v);
VariantCopyInd(&obj->v, v);
Expand Down
2 changes: 0 additions & 2 deletions ext/com_dotnet/php_com_dotnet_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ typedef struct _php_com_dotnet_object {

ITypeInfo *typeinfo;

zend_class_entry *ce;

/* associated event sink */
IDispatch *sink_dispatch;
GUID sink_id;
Expand Down
Loading