Remove proto comments from C files

Closes GH-5758

4 files changed, 48 insertions, 96 deletions

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 768e3a1169..315e091ca3 100644
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -282,8 +282,7 @@ PHP_METHOD(com, __construct)
 }
 /* }}} */
 
-/* {{{ proto object com_get_active_object(string progid [, int code_page ])
-   Returns a handle to an already running instance of a COM object */
+/* {{{ Returns a handle to an already running instance of a COM object */
 PHP_FUNCTION(com_get_active_object)
 {
 	CLSID clsid;
@@ -658,8 +657,7 @@ int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen,
 	return php_com_do_invoke_by_id(obj, dispid, flags, v, nargs, args, 0, allow_noarg);
 }
 
-/* {{{ proto string com_create_guid()
-   Generate a globally unique identifier (GUID) */
+/* {{{ Generate a globally unique identifier (GUID) */
 PHP_FUNCTION(com_create_guid)
 {
 	GUID retval;
@@ -686,8 +684,7 @@ PHP_FUNCTION(com_create_guid)
 }
 /* }}} */
 
-/* {{{ proto bool com_event_sink(object comobject, object sinkobject [, mixed sinkinterface])
-   Connect events from a COM object to a PHP object */
+/* {{{ Connect events from a COM object to a PHP object */
 PHP_FUNCTION(com_event_sink)
 {
 	zval *object, *sinkobject, *sink=NULL;
@@ -746,8 +743,7 @@ PHP_FUNCTION(com_event_sink)
 }
 /* }}} */
 
-/* {{{ proto bool com_print_typeinfo(object comobject | string typelib, string dispinterface, bool wantsink)
-   Print out a PHP class definition for a dispatchable interface */
+/* {{{ Print out a PHP class definition for a dispatchable interface */
 PHP_FUNCTION(com_print_typeinfo)
 {
 	zval *arg1;
@@ -783,8 +779,7 @@ PHP_FUNCTION(com_print_typeinfo)
 }
 /* }}} */
 
-/* {{{ proto bool com_message_pump([int timeoutms])
-   Process COM messages, sleeping for up to timeoutms milliseconds */
+/* {{{ Process COM messages, sleeping for up to timeoutms milliseconds */
 PHP_FUNCTION(com_message_pump)
 {
 	zend_long timeoutms = 0;
@@ -811,8 +806,7 @@ PHP_FUNCTION(com_message_pump)
 }
 /* }}} */
 
-/* {{{ proto bool com_load_typelib(string typelib_name [, bool case_insensitive])
-   Loads a Typelibrary and registers its constants */
+/* {{{ Loads a Typelibrary and registers its constants */
 PHP_FUNCTION(com_load_typelib)
 {
 	char *name;
diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index 66f64207b0..a39e792ae9 100644
--- a/ext/com_dotnet/com_extension.c
+++ b/ext/com_dotnet/com_extension.c
@@ -37,8 +37,7 @@ zend_class_entry
    	*php_com_exception_class_entry,
 	*php_com_saproxy_class_entry;
 
-/* {{{ com_dotnet_module_entry
- */
+/* {{{ com_dotnet_module_entry */
 zend_module_entry com_dotnet_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"com_dotnet",
@@ -64,8 +63,7 @@ ZEND_TSRMLS_CACHE_DEFINE()
 ZEND_GET_MODULE(com_dotnet)
 #endif
 
-/* {{{ PHP_INI
- */
+/* {{{ PHP_INI */
 
 /* com.typelib_file is the path to a file containing a
  * list of typelibraries to register *persistently*.
@@ -149,8 +147,7 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
-/* {{{ PHP_GINIT_FUNCTION
- */
+/* {{{ PHP_GINIT_FUNCTION */
 static PHP_GINIT_FUNCTION(com_dotnet)
 {
 #if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS)
@@ -161,8 +158,7 @@ static PHP_GINIT_FUNCTION(com_dotnet)
 }
 /* }}} */
 
-/* {{{ PHP_MINIT_FUNCTION
- */
+/* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(com_dotnet)
 {
 	zend_class_entry ce, *tmp;
@@ -288,8 +284,7 @@ PHP_MINIT_FUNCTION(com_dotnet)
 }
 /* }}} */
 
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
+/* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(com_dotnet)
 {
 	UNREGISTER_INI_ENTRIES();
@@ -305,8 +300,7 @@ PHP_MSHUTDOWN_FUNCTION(com_dotnet)
 }
 /* }}} */
 
-/* {{{ PHP_RINIT_FUNCTION
- */
+/* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(com_dotnet)
 {
 	COMG(rshutdown_started) = 0;
@@ -314,8 +308,7 @@ PHP_RINIT_FUNCTION(com_dotnet)
 }
 /* }}} */
 
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
+/* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(com_dotnet)
 {
 #if HAVE_MSCOREE_H
@@ -328,8 +321,7 @@ PHP_RSHUTDOWN_FUNCTION(com_dotnet)
 }
 /* }}} */
 
-/* {{{ PHP_MINFO_FUNCTION
- */
+/* {{{ PHP_MINFO_FUNCTION */
 PHP_MINFO_FUNCTION(com_dotnet)
 {
 	php_info_print_table_start();
diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index e43ef5e5ea..c45910583b 100644
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@@ -320,8 +320,7 @@ static inline HRESULT get_persist_file(php_com_persist_helper *helper)
 }
 
 
-/* {{{ proto string COMPersistHelper::GetCurFile()
-   Determines the filename into which an object will be saved, or false if none is set, via IPersistFile::GetCurFile */
+/* {{{ Determines the filename into which an object will be saved, or false if none is set, via IPersistFile::GetCurFile */
 CPH_METHOD(GetCurFileName)
 {
 	HRESULT res;
@@ -359,8 +358,7 @@ CPH_METHOD(GetCurFileName)
 /* }}} */
 
 
-/* {{{ proto bool COMPersistHelper::SaveToFile(string filename [, bool remember])
-   Persist object data to file, via IPersistFile::Save */
+/* {{{ Persist object data to file, via IPersistFile::Save */
 CPH_METHOD(SaveToFile)
 {
 	HRESULT res;
@@ -421,8 +419,7 @@ CPH_METHOD(SaveToFile)
 }
 /* }}} */
 
-/* {{{ proto bool COMPersistHelper::LoadFromFile(string filename [, int flags])
-   Load object data from file, via IPersistFile::Load */
+/* {{{ Load object data from file, via IPersistFile::Load */
 CPH_METHOD(LoadFromFile)
 {
 	HRESULT res;
@@ -466,8 +463,7 @@ CPH_METHOD(LoadFromFile)
 }
 /* }}} */
 
-/* {{{ proto int COMPersistHelper::GetMaxStreamSize()
-   Gets maximum stream size required to store the object data, via IPersistStream::GetSizeMax (or IPersistStreamInit::GetSizeMax) */
+/* {{{ Gets maximum stream size required to store the object data, via IPersistStream::GetSizeMax (or IPersistStreamInit::GetSizeMax) */
 CPH_METHOD(GetMaxStreamSize)
 {
 	HRESULT res;
@@ -502,8 +498,7 @@ CPH_METHOD(GetMaxStreamSize)
 }
 /* }}} */
 
-/* {{{ proto int COMPersistHelper::InitNew()
-   Initializes the object to a default state, via IPersistStreamInit::InitNew */
+/* {{{ Initializes the object to a default state, via IPersistStreamInit::InitNew */
 CPH_METHOD(InitNew)
 {
 	HRESULT res;
@@ -530,8 +525,7 @@ CPH_METHOD(InitNew)
 }
 /* }}} */
 
-/* {{{ proto mixed COMPersistHelper::LoadFromStream(resource stream)
-   Initializes an object from the stream where it was previously saved, via IPersistStream::Load or OleLoadFromStream */
+/* {{{ Initializes an object from the stream where it was previously saved, via IPersistStream::Load or OleLoadFromStream */
 CPH_METHOD(LoadFromStream)
 {
 	zval *zstm;
@@ -589,8 +583,7 @@ CPH_METHOD(LoadFromStream)
 }
 /* }}} */
 
-/* {{{ proto int COMPersistHelper::SaveToStream(resource stream)
-   Saves the object to a stream, via IPersistStream::Save */
+/* {{{ Saves the object to a stream, via IPersistStream::Save */
 CPH_METHOD(SaveToStream)
 {
 	zval *zstm;
@@ -639,8 +632,7 @@ CPH_METHOD(SaveToStream)
 }
 /* }}} */
 
-/* {{{ proto COMPersistHelper::__construct([object com_object])
-   Creates a persistence helper object, usually associated with a com_object */
+/* {{{ Creates a persistence helper object, usually associated with a com_object */
 CPH_METHOD(__construct)
 {
 	php_com_dotnet_object *obj = NULL;
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 83940e93a1..949f3ca1dd 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -491,8 +491,7 @@ PHP_METHOD(variant, __construct)
 }
 /* }}} */
 
-/* {{{ proto void variant_set(object variant, mixed value)
-   Assigns a new value for a variant object */
+/* {{{ Assigns a new value for a variant object */
 PHP_FUNCTION(variant_set)
 {
 	zval *zobj, *zvalue = NULL;
@@ -638,104 +637,91 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN
 }
 /* }}} */
 
-/* {{{ proto mixed variant_add(mixed left, mixed right)
-   "Adds" two variant values together and returns the result */
+/* {{{ "Adds" two variant values together and returns the result */
 PHP_FUNCTION(variant_add)
 {
 	variant_binary_operation(VOP_ADD, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_cat(mixed left, mixed right)
-   concatenates two variant values together and returns the result */
+/* {{{ concatenates two variant values together and returns the result */
 PHP_FUNCTION(variant_cat)
 {
 	variant_binary_operation(VOP_CAT, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_sub(mixed left, mixed right)
-   subtracts the value of the right variant from the left variant value and returns the result */
+/* {{{ subtracts the value of the right variant from the left variant value and returns the result */
 PHP_FUNCTION(variant_sub)
 {
 	variant_binary_operation(VOP_SUB, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_mul(mixed left, mixed right)
-   multiplies the values of the two variants and returns the result */
+/* {{{ multiplies the values of the two variants and returns the result */
 PHP_FUNCTION(variant_mul)
 {
 	variant_binary_operation(VOP_MUL, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_and(mixed left, mixed right)
-   performs a bitwise AND operation between two variants and returns the result */
+/* {{{ performs a bitwise AND operation between two variants and returns the result */
 PHP_FUNCTION(variant_and)
 {
 	variant_binary_operation(VOP_AND, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_div(mixed left, mixed right)
-   Returns the result from dividing two variants */
+/* {{{ Returns the result from dividing two variants */
 PHP_FUNCTION(variant_div)
 {
 	variant_binary_operation(VOP_DIV, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_eqv(mixed left, mixed right)
-   Performs a bitwise equivalence on two variants */
+/* {{{ Performs a bitwise equivalence on two variants */
 PHP_FUNCTION(variant_eqv)
 {
 	variant_binary_operation(VOP_EQV, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_idiv(mixed left, mixed right)
-   Converts variants to integers and then returns the result from dividing them */
+/* {{{ Converts variants to integers and then returns the result from dividing them */
 PHP_FUNCTION(variant_idiv)
 {
 	variant_binary_operation(VOP_IDIV, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_imp(mixed left, mixed right)
-   Performs a bitwise implication on two variants */
+/* {{{ Performs a bitwise implication on two variants */
 PHP_FUNCTION(variant_imp)
 {
 	variant_binary_operation(VOP_IMP, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_mod(mixed left, mixed right)
-   Divides two variants and returns only the remainder */
+/* {{{ Divides two variants and returns only the remainder */
 PHP_FUNCTION(variant_mod)
 {
 	variant_binary_operation(VOP_MOD, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_or(mixed left, mixed right)
-   Performs a logical disjunction on two variants */
+/* {{{ Performs a logical disjunction on two variants */
 PHP_FUNCTION(variant_or)
 {
 	variant_binary_operation(VOP_OR, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_pow(mixed left, mixed right)
-   Returns the result of performing the power function with two variants */
+/* {{{ Returns the result of performing the power function with two variants */
 PHP_FUNCTION(variant_pow)
 {
 	variant_binary_operation(VOP_POW, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_xor(mixed left, mixed right)
-   Performs a logical exclusion on two variants */
+/* {{{ Performs a logical exclusion on two variants */
 PHP_FUNCTION(variant_xor)
 {
 	variant_binary_operation(VOP_XOR, INTERNAL_FUNCTION_PARAM_PASSTHRU);
@@ -798,48 +784,42 @@ static void variant_unary_operation(enum variant_unary_opcode op, INTERNAL_FUNCT
 }
 /* }}} */
 
-/* {{{ proto mixed variant_abs(mixed left)
-   Returns the absolute value of a variant */
+/* {{{ Returns the absolute value of a variant */
 PHP_FUNCTION(variant_abs)
 {
 	variant_unary_operation(VOP_ABS, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_fix(mixed left)
-   Returns the integer part ? of a variant */
+/* {{{ Returns the integer part ? of a variant */
 PHP_FUNCTION(variant_fix)
 {
 	variant_unary_operation(VOP_FIX, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_int(mixed left)
-   Returns the integer portion of a variant */
+/* {{{ Returns the integer portion of a variant */
 PHP_FUNCTION(variant_int)
 {
 	variant_unary_operation(VOP_INT, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_neg(mixed left)
-   Performs logical negation on a variant */
+/* {{{ Performs logical negation on a variant */
 PHP_FUNCTION(variant_neg)
 {
 	variant_unary_operation(VOP_NEG, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_not(mixed left)
-   Performs bitwise not negation on a variant */
+/* {{{ Performs bitwise not negation on a variant */
 PHP_FUNCTION(variant_not)
 {
 	variant_unary_operation(VOP_NOT, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
-/* {{{ proto mixed variant_round(mixed left, int decimals)
-   Rounds a variant to the specified number of decimal places */
+/* {{{ Rounds a variant to the specified number of decimal places */
 PHP_FUNCTION(variant_round)
 {
 	VARIANT vres;
@@ -874,8 +854,7 @@ PHP_FUNCTION(variant_round)
 }
 /* }}} */
 
-/* {{{ proto int variant_cmp(mixed left, mixed right [, int lcid [, int flags]])
-   Compares two variants */
+/* {{{ Compares two variants */
 PHP_FUNCTION(variant_cmp)
 {
 	VARIANT left_val, right_val;
@@ -932,8 +911,7 @@ PHP_FUNCTION(variant_cmp)
 }
 /* }}} */
 
-/* {{{ proto int variant_date_to_timestamp(object variant)
-   Converts a variant date/time value to unix timestamp */
+/* {{{ Converts a variant date/time value to unix timestamp */
 PHP_FUNCTION(variant_date_to_timestamp)
 {
 	VARIANT vres;
@@ -971,8 +949,7 @@ PHP_FUNCTION(variant_date_to_timestamp)
 }
 /* }}} */
 
-/* {{{ proto object variant_date_from_timestamp(int timestamp)
-   Returns a variant date representation of a unix timestamp */
+/* {{{ Returns a variant date representation of a unix timestamp */
 PHP_FUNCTION(variant_date_from_timestamp)
 {
 	zend_long timestamp;
@@ -1020,8 +997,7 @@ PHP_FUNCTION(variant_date_from_timestamp)
 }
 /* }}} */
 
-/* {{{ proto int variant_get_type(object variant)
-   Returns the VT_XXX type code for a variant */
+/* {{{ Returns the VT_XXX type code for a variant */
 PHP_FUNCTION(variant_get_type)
 {
 	zval *zobj;
@@ -1037,8 +1013,7 @@ PHP_FUNCTION(variant_get_type)
 }
 /* }}} */
 
-/* {{{ proto void variant_set_type(object variant, int type)
-   Convert a variant into another type.  Variant is modified "in-place" */
+/* {{{ Convert a variant into another type.  Variant is modified "in-place" */
 PHP_FUNCTION(variant_set_type)
 {
 	zval *zobj;
@@ -1072,8 +1047,7 @@ PHP_FUNCTION(variant_set_type)
 }
 /* }}} */
 
-/* {{{ proto object variant_cast(object variant, int type)
-   Convert a variant into a new variant object of another type */
+/* {{{ Convert a variant into a new variant object of another type */
 PHP_FUNCTION(variant_cast)
 {
 	zval *zobj;