Improve class entry generation

Related to GH-6701

7 files changed, 26 insertions, 33 deletions

diff --git a/Zend/zend_attributes_arginfo.h b/Zend/zend_attributes_arginfo.h
index 3b605ad891..a09f9161fd 100644
--- a/Zend/zend_attributes_arginfo.h
+++ b/Zend/zend_attributes_arginfo.h
@@ -14,7 +14,7 @@ static const zend_function_entry class_Attribute_methods[] = {
 	ZEND_FE_END
 };
 
-zend_class_entry *register_class_Attribute()
+static zend_class_entry *register_class_Attribute(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -30,4 +30,3 @@ zend_class_entry *register_class_Attribute()
 
 	return class_entry;
 }
-
diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h
index 9124d6daf4..abf380537e 100644
--- a/Zend/zend_builtin_functions_arginfo.h
+++ b/Zend/zend_builtin_functions_arginfo.h
@@ -333,4 +333,3 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(gc_status, arginfo_gc_status)
 	ZEND_FE_END
 };
-
diff --git a/Zend/zend_closures_arginfo.h b/Zend/zend_closures_arginfo.h
index 3295ab2cf2..56bd16ffb6 100644
--- a/Zend/zend_closures_arginfo.h
+++ b/Zend/zend_closures_arginfo.h
@@ -41,7 +41,7 @@ static const zend_function_entry class_Closure_methods[] = {
 	ZEND_FE_END
 };
 
-zend_class_entry *register_class_Closure()
+static zend_class_entry *register_class_Closure(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -51,4 +51,3 @@ zend_class_entry *register_class_Closure()
 
 	return class_entry;
 }
-
diff --git a/Zend/zend_exceptions_arginfo.h b/Zend/zend_exceptions_arginfo.h
index 0c74118a7b..8e8fb7c20b 100644
--- a/Zend/zend_exceptions_arginfo.h
+++ b/Zend/zend_exceptions_arginfo.h
@@ -186,7 +186,7 @@ static const zend_function_entry class_UnhandledMatchError_methods[] = {
 	ZEND_FE_END
 };
 
-zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringable)
+static zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringable)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -197,7 +197,7 @@ zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringa
 	return class_entry;
 }
 
-zend_class_entry *register_class_Exception(zend_class_entry *class_entry_Throwable)
+static zend_class_entry *register_class_Exception(zend_class_entry *class_entry_Throwable)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -251,7 +251,7 @@ zend_class_entry *register_class_Exception(zend_class_entry *class_entry_Throwab
 	return class_entry;
 }
 
-zend_class_entry *register_class_ErrorException(zend_class_entry *class_entry_Exception)
+static zend_class_entry *register_class_ErrorException(zend_class_entry *class_entry_Exception)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -261,7 +261,7 @@ zend_class_entry *register_class_ErrorException(zend_class_entry *class_entry_Ex
 	return class_entry;
 }
 
-zend_class_entry *register_class_Error(zend_class_entry *class_entry_Throwable)
+static zend_class_entry *register_class_Error(zend_class_entry *class_entry_Throwable)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -315,7 +315,7 @@ zend_class_entry *register_class_Error(zend_class_entry *class_entry_Throwable)
 	return class_entry;
 }
 
-zend_class_entry *register_class_CompileError(zend_class_entry *class_entry_Error)
+static zend_class_entry *register_class_CompileError(zend_class_entry *class_entry_Error)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -325,7 +325,7 @@ zend_class_entry *register_class_CompileError(zend_class_entry *class_entry_Erro
 	return class_entry;
 }
 
-zend_class_entry *register_class_ParseError(zend_class_entry *class_entry_CompileError)
+static zend_class_entry *register_class_ParseError(zend_class_entry *class_entry_CompileError)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -335,7 +335,7 @@ zend_class_entry *register_class_ParseError(zend_class_entry *class_entry_Compil
 	return class_entry;
 }
 
-zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_Error)
+static zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_Error)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -345,7 +345,7 @@ zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_Error)
 	return class_entry;
 }
 
-zend_class_entry *register_class_ArgumentCountError(zend_class_entry *class_entry_TypeError)
+static zend_class_entry *register_class_ArgumentCountError(zend_class_entry *class_entry_TypeError)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -355,7 +355,7 @@ zend_class_entry *register_class_ArgumentCountError(zend_class_entry *class_entr
 	return class_entry;
 }
 
-zend_class_entry *register_class_ValueError(zend_class_entry *class_entry_Error)
+static zend_class_entry *register_class_ValueError(zend_class_entry *class_entry_Error)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -365,7 +365,7 @@ zend_class_entry *register_class_ValueError(zend_class_entry *class_entry_Error)
 	return class_entry;
 }
 
-zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_entry_Error)
+static zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_entry_Error)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -375,7 +375,7 @@ zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_entry_E
 	return class_entry;
 }
 
-zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *class_entry_ArithmeticError)
+static zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *class_entry_ArithmeticError)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -385,7 +385,7 @@ zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *class_ent
 	return class_entry;
 }
 
-zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *class_entry_Error)
+static zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *class_entry_Error)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -394,4 +394,3 @@ zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *class_ent
 
 	return class_entry;
 }
-
diff --git a/Zend/zend_generators_arginfo.h b/Zend/zend_generators_arginfo.h
index 5398ce9507..17a82b1f4b 100644
--- a/Zend/zend_generators_arginfo.h
+++ b/Zend/zend_generators_arginfo.h
@@ -52,7 +52,7 @@ static const zend_function_entry class_ClosedGeneratorException_methods[] = {
 	ZEND_FE_END
 };
 
-zend_class_entry *register_class_Generator(zend_class_entry *class_entry_Iterator)
+static zend_class_entry *register_class_Generator(zend_class_entry *class_entry_Iterator)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -64,7 +64,7 @@ zend_class_entry *register_class_Generator(zend_class_entry *class_entry_Iterato
 	return class_entry;
 }
 
-zend_class_entry *register_class_ClosedGeneratorException(zend_class_entry *class_entry_Exception)
+static zend_class_entry *register_class_ClosedGeneratorException(zend_class_entry *class_entry_Exception)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -73,4 +73,3 @@ zend_class_entry *register_class_ClosedGeneratorException(zend_class_entry *clas
 
 	return class_entry;
 }
-
diff --git a/Zend/zend_interfaces_arginfo.h b/Zend/zend_interfaces_arginfo.h
index 4bfe123c1d..c34f5463a0 100644
--- a/Zend/zend_interfaces_arginfo.h
+++ b/Zend/zend_interfaces_arginfo.h
@@ -120,7 +120,7 @@ static const zend_function_entry class_InternalIterator_methods[] = {
 	ZEND_FE_END
 };
 
-zend_class_entry *register_class_Traversable()
+static zend_class_entry *register_class_Traversable(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -130,7 +130,7 @@ zend_class_entry *register_class_Traversable()
 	return class_entry;
 }
 
-zend_class_entry *register_class_IteratorAggregate(zend_class_entry *class_entry_Traversable)
+static zend_class_entry *register_class_IteratorAggregate(zend_class_entry *class_entry_Traversable)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -141,7 +141,7 @@ zend_class_entry *register_class_IteratorAggregate(zend_class_entry *class_entry
 	return class_entry;
 }
 
-zend_class_entry *register_class_Iterator(zend_class_entry *class_entry_Traversable)
+static zend_class_entry *register_class_Iterator(zend_class_entry *class_entry_Traversable)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -152,7 +152,7 @@ zend_class_entry *register_class_Iterator(zend_class_entry *class_entry_Traversa
 	return class_entry;
 }
 
-zend_class_entry *register_class_ArrayAccess()
+static zend_class_entry *register_class_ArrayAccess(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -162,7 +162,7 @@ zend_class_entry *register_class_ArrayAccess()
 	return class_entry;
 }
 
-zend_class_entry *register_class_Serializable()
+static zend_class_entry *register_class_Serializable(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -172,7 +172,7 @@ zend_class_entry *register_class_Serializable()
 	return class_entry;
 }
 
-zend_class_entry *register_class_Countable()
+static zend_class_entry *register_class_Countable(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -182,7 +182,7 @@ zend_class_entry *register_class_Countable()
 	return class_entry;
 }
 
-zend_class_entry *register_class_Stringable()
+static zend_class_entry *register_class_Stringable(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -192,7 +192,7 @@ zend_class_entry *register_class_Stringable()
 	return class_entry;
 }
 
-zend_class_entry *register_class_InternalIterator(zend_class_entry *class_entry_Iterator)
+static zend_class_entry *register_class_InternalIterator(zend_class_entry *class_entry_Iterator)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -203,4 +203,3 @@ zend_class_entry *register_class_InternalIterator(zend_class_entry *class_entry_
 
 	return class_entry;
 }
-
diff --git a/Zend/zend_weakrefs_arginfo.h b/Zend/zend_weakrefs_arginfo.h
index 43396f0628..d737faebe5 100644
--- a/Zend/zend_weakrefs_arginfo.h
+++ b/Zend/zend_weakrefs_arginfo.h
@@ -64,7 +64,7 @@ static const zend_function_entry class_WeakMap_methods[] = {
 	ZEND_FE_END
 };
 
-zend_class_entry *register_class_WeakReference()
+static zend_class_entry *register_class_WeakReference(void)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -75,7 +75,7 @@ zend_class_entry *register_class_WeakReference()
 	return class_entry;
 }
 
-zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_ArrayAccess, zend_class_entry *class_entry_Countable, zend_class_entry *class_entry_IteratorAggregate)
+static zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_ArrayAccess, zend_class_entry *class_entry_Countable, zend_class_entry *class_entry_IteratorAggregate)
 {
 	zend_class_entry ce, *class_entry;
 
@@ -86,4 +86,3 @@ zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_ArrayAcce
 
 	return class_entry;
 }
-