From 9e930907dfea44df74eccb39648fcde6be8cd7e1 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 11 Aug 2020 10:17:43 +0200 Subject: [PATCH] Autogenerate function entries for COMPersistHelper Co-authored-by: Nikita Popov --- ext/com_dotnet/com_persist.c | 19 ++----------------- ext/com_dotnet/com_persist.stub.php | 1 + ext/com_dotnet/com_persist_arginfo.h | 25 ++++++++++++++++++++++++- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index c45910583b..3bde7175d8 100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -276,8 +276,7 @@ PHP_COM_DOTNET_API IStream *php_com_wrapper_export_stream(php_stream *stream) return (IStream*)stm; } -#define CPH_ME(fname, arginfo) PHP_ME(com_persist, fname, arginfo, ZEND_ACC_PUBLIC) -#define CPH_METHOD(fname) static PHP_METHOD(com_persist, fname) +#define CPH_METHOD(fname) PHP_METHOD(COMPersistHelper, fname) #define CPH_FETCH() php_com_persist_helper *helper = (php_com_persist_helper*)Z_OBJ_P(getThis()); @@ -663,20 +662,6 @@ CPH_METHOD(__construct) /* }}} */ - - -static const zend_function_entry com_persist_helper_methods[] = { - CPH_ME(__construct, arginfo_class_COMPersistHelper___construct) - CPH_ME(GetCurFileName, arginfo_class_COMPersistHelper_GetCurFileName) - CPH_ME(SaveToFile, arginfo_class_COMPersistHelper_SaveToFile) - CPH_ME(LoadFromFile, arginfo_class_COMPersistHelper_LoadFromFile) - CPH_ME(GetMaxStreamSize, arginfo_class_COMPersistHelper_GetMaxStreamSize) - CPH_ME(InitNew, arginfo_class_COMPersistHelper_InitNew) - CPH_ME(LoadFromStream, arginfo_class_COMPersistHelper_LoadFromStream) - CPH_ME(SaveToStream, arginfo_class_COMPersistHelper_SaveToStream) - PHP_FE_END -}; - static void helper_free_storage(zend_object *obj) { php_com_persist_helper *object = (php_com_persist_helper*)obj; @@ -742,7 +727,7 @@ int php_com_persist_minit(INIT_FUNC_ARGS) helper_handlers.free_obj = helper_free_storage; helper_handlers.clone_obj = helper_clone; - INIT_CLASS_ENTRY(ce, "COMPersistHelper", com_persist_helper_methods); + INIT_CLASS_ENTRY(ce, "COMPersistHelper", class_COMPersistHelper_methods); ce.create_object = helper_new; helper_ce = zend_register_internal_class(&ce); helper_ce->ce_flags |= ZEND_ACC_FINAL; diff --git a/ext/com_dotnet/com_persist.stub.php b/ext/com_dotnet/com_persist.stub.php index c4155bceb1..09a842d8fb 100644 --- a/ext/com_dotnet/com_persist.stub.php +++ b/ext/com_dotnet/com_persist.stub.php @@ -1,5 +1,6 @@