- Fixed proto's (Patch by Zak)

Derick Rethans · Derick Rethans · commit 91424b2b9154 · 2001-07-02T11:11:58.000Z
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -945,7 +945,7 @@ PHP_FUNCTION(constant)
 /* }}} */
 
 
-/* {{{ proto string ip2long(string ip_address)
+/* {{{ proto int ip2long(string ip_address)
    Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address */
 PHP_FUNCTION(ip2long)
 {
@@ -1015,7 +1015,7 @@ PHP_FUNCTION(getenv)
 
 #ifdef HAVE_PUTENV
 
-/* {{{ proto void putenv(string setting)
+/* {{{ proto bool putenv(string setting)
    Set the value of an environment variable */
 PHP_FUNCTION(putenv)
 {
@@ -1253,7 +1253,7 @@ PHP_FUNCTION(gettype)
 }
 /* }}} */
 
-/* {{{ proto int settype(mixed var, string type)
+/* {{{ proto bool settype(mixed var, string type)
    Set the type of the variable */
 PHP_FUNCTION(settype)
 {
@@ -1318,7 +1318,7 @@ PHP_FUNCTION(get_cfg_var)
 /* }}} */
 
 
-/* {{{ proto int set_magic_quotes_runtime(int new_setting)
+/* {{{ proto bool set_magic_quotes_runtime(int new_setting)
    Set the current active configuration setting of magic_quotes_runtime and return previous */
 PHP_FUNCTION(set_magic_quotes_runtime)
 {
@@ -1505,7 +1505,7 @@ PHP_FUNCTION(is_scalar)
 	3 = save to file in 3rd parameter
 */
 
-/* {{{ proto int error_log(string message, int message_type [, string destination] [, string extra_headers])
+/* {{{ proto bool error_log(string message, int message_type [, string destination] [, string extra_headers])
    Send an error message somewhere */
 PHP_FUNCTION(error_log)
 {
@@ -1717,7 +1717,7 @@ PHP_FUNCTION(call_user_method)
 	int arg_count=ZEND_NUM_ARGS();
 
 	php_error(E_NOTICE, _CUM_DEPREC, "call_user_method");
-	
+
 	if (arg_count<2) {
 		WRONG_PARAM_COUNT;
 	}
@@ -1939,7 +1939,7 @@ ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highl
 }
 
 
-/* {{{ proto boolean highlight_file(string file_name)
+/* {{{ proto bool highlight_file(string file_name)
    Syntax highlight a source file */
 PHP_FUNCTION(highlight_file)
 {
@@ -1962,7 +1962,7 @@ PHP_FUNCTION(highlight_file)
 /* }}} */
 
 
-/* {{{ proto boolean highlight_string(string string)
+/* {{{ proto bool highlight_string(string string)
    Syntax highlight a string */
 PHP_FUNCTION(highlight_string)
 {
@@ -2179,7 +2179,7 @@ PHP_FUNCTION(ini_restore)
 }
 /* }}} */
 
-/* {{{ proto string print_r(mixed var)
+/* {{{ proto bool print_r(mixed var)
    Prints out information about the specified variable */
 PHP_FUNCTION(print_r)
 {
@@ -2348,7 +2348,7 @@ PHP_FUNCTION(getprotobynumber)
 /* }}} */
 
 
-/* {{{ proto void register_tick_function(string function_name [, mixed arg [, ... ]])
+/* {{{ proto bool register_tick_function(string function_name [, mixed arg [, ... ]])
    Registers a tick callback function */
 PHP_FUNCTION(register_tick_function)
 {
@@ -2420,7 +2420,7 @@ PHPAPI PHP_FUNCTION(warn_not_available)
 }
 
 
-/* {{{ proto boolean is_uploaded_file(string path)
+/* {{{ proto bool is_uploaded_file(string path)
    check if file was created by rfc1867 upload  */
 PHP_FUNCTION(is_uploaded_file)
 {
@@ -2445,7 +2445,7 @@ PHP_FUNCTION(is_uploaded_file)
 /* }}} */
 
 
-/* {{{ proto boolean move_uploaded_file(string path, string new_path)
+/* {{{ proto bool move_uploaded_file(string path, string new_path)
    move a file if and only if it was created by an upload */
 PHP_FUNCTION(move_uploaded_file)
 {
@@ -2539,7 +2539,7 @@ static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, int callback
 }
 
 
-/* {{{ proto void parse_ini_file(string filename [, boolean process_sections])
+/* {{{ proto array parse_ini_file(string filename [, boolean process_sections])
    Parse configuration file */
 PHP_FUNCTION(parse_ini_file)
 {

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ PHP_FUNCTION(constant)`
`945`	`945`	`/* }}} */`
`946`	`946`
`947`	`947`
`948`		`-/* {{{ proto string ip2long(string ip_address)`
	`948`	`+/* {{{ proto int ip2long(string ip_address)`
`949`	`949`	`Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address */`
`950`	`950`	`PHP_FUNCTION(ip2long)`
`951`	`951`	`{`
`@@ -1015,7 +1015,7 @@ PHP_FUNCTION(getenv)`
`1015`	`1015`
`1016`	`1016`	`#ifdef HAVE_PUTENV`
`1017`	`1017`
`1018`		`-/* {{{ proto void putenv(string setting)`
	`1018`	`+/* {{{ proto bool putenv(string setting)`
`1019`	`1019`	`Set the value of an environment variable */`
`1020`	`1020`	`PHP_FUNCTION(putenv)`
`1021`	`1021`	`{`
`@@ -1253,7 +1253,7 @@ PHP_FUNCTION(gettype)`
`1253`	`1253`	`}`
`1254`	`1254`	`/* }}} */`
`1255`	`1255`
`1256`		`-/* {{{ proto int settype(mixed var, string type)`
	`1256`	`+/* {{{ proto bool settype(mixed var, string type)`
`1257`	`1257`	`Set the type of the variable */`
`1258`	`1258`	`PHP_FUNCTION(settype)`
`1259`	`1259`	`{`
`@@ -1318,7 +1318,7 @@ PHP_FUNCTION(get_cfg_var)`
`1318`	`1318`	`/* }}} */`
`1319`	`1319`
`1320`	`1320`
`1321`		`-/* {{{ proto int set_magic_quotes_runtime(int new_setting)`
	`1321`	`+/* {{{ proto bool set_magic_quotes_runtime(int new_setting)`
`1322`	`1322`	`Set the current active configuration setting of magic_quotes_runtime and return previous */`
`1323`	`1323`	`PHP_FUNCTION(set_magic_quotes_runtime)`
`1324`	`1324`	`{`
`@@ -1505,7 +1505,7 @@ PHP_FUNCTION(is_scalar)`
`1505`	`1505`	`3 = save to file in 3rd parameter`
`1506`	`1506`	`*/`
`1507`	`1507`
`1508`		`-/* {{{ proto int error_log(string message, int message_type [, string destination] [, string extra_headers])`
	`1508`	`+/* {{{ proto bool error_log(string message, int message_type [, string destination] [, string extra_headers])`
`1509`	`1509`	`Send an error message somewhere */`
`1510`	`1510`	`PHP_FUNCTION(error_log)`
`1511`	`1511`	`{`
`@@ -1717,7 +1717,7 @@ PHP_FUNCTION(call_user_method)`
`1717`	`1717`	`int arg_count=ZEND_NUM_ARGS();`
`1718`	`1718`
`1719`	`1719`	`php_error(E_NOTICE, _CUM_DEPREC, "call_user_method");`
`1720`		`-`
	`1720`	`+`
`1721`	`1721`	`if (arg_count<2) {`
`1722`	`1722`	`WRONG_PARAM_COUNT;`
`1723`	`1723`	`}`
`@@ -1939,7 +1939,7 @@ ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highl`
`1939`	`1939`	`}`
`1940`	`1940`
`1941`	`1941`
`1942`		`-/* {{{ proto boolean highlight_file(string file_name)`
	`1942`	`+/* {{{ proto bool highlight_file(string file_name)`
`1943`	`1943`	`Syntax highlight a source file */`
`1944`	`1944`	`PHP_FUNCTION(highlight_file)`
`1945`	`1945`	`{`
`@@ -1962,7 +1962,7 @@ PHP_FUNCTION(highlight_file)`
`1962`	`1962`	`/* }}} */`
`1963`	`1963`
`1964`	`1964`
`1965`		`-/* {{{ proto boolean highlight_string(string string)`
	`1965`	`+/* {{{ proto bool highlight_string(string string)`
`1966`	`1966`	`Syntax highlight a string */`
`1967`	`1967`	`PHP_FUNCTION(highlight_string)`
`1968`	`1968`	`{`
`@@ -2179,7 +2179,7 @@ PHP_FUNCTION(ini_restore)`
`2179`	`2179`	`}`
`2180`	`2180`	`/* }}} */`
`2181`	`2181`
`2182`		`-/* {{{ proto string print_r(mixed var)`
	`2182`	`+/* {{{ proto bool print_r(mixed var)`
`2183`	`2183`	`Prints out information about the specified variable */`
`2184`	`2184`	`PHP_FUNCTION(print_r)`
`2185`	`2185`	`{`
`@@ -2348,7 +2348,7 @@ PHP_FUNCTION(getprotobynumber)`
`2348`	`2348`	`/* }}} */`
`2349`	`2349`
`2350`	`2350`
`2351`		`-/* {{{ proto void register_tick_function(string function_name [, mixed arg [, ... ]])`
	`2351`	`+/* {{{ proto bool register_tick_function(string function_name [, mixed arg [, ... ]])`
`2352`	`2352`	`Registers a tick callback function */`
`2353`	`2353`	`PHP_FUNCTION(register_tick_function)`
`2354`	`2354`	`{`
`@@ -2420,7 +2420,7 @@ PHPAPI PHP_FUNCTION(warn_not_available)`
`2420`	`2420`	`}`
`2421`	`2421`
`2422`	`2422`
`2423`		`-/* {{{ proto boolean is_uploaded_file(string path)`
	`2423`	`+/* {{{ proto bool is_uploaded_file(string path)`
`2424`	`2424`	`check if file was created by rfc1867 upload */`
`2425`	`2425`	`PHP_FUNCTION(is_uploaded_file)`
`2426`	`2426`	`{`
`@@ -2445,7 +2445,7 @@ PHP_FUNCTION(is_uploaded_file)`
`2445`	`2445`	`/* }}} */`
`2446`	`2446`
`2447`	`2447`
`2448`		`-/* {{{ proto boolean move_uploaded_file(string path, string new_path)`
	`2448`	`+/* {{{ proto bool move_uploaded_file(string path, string new_path)`
`2449`	`2449`	`move a file if and only if it was created by an upload */`
`2450`	`2450`	`PHP_FUNCTION(move_uploaded_file)`
`2451`	`2451`	`{`
`@@ -2539,7 +2539,7 @@ static void php_ini_parser_cb_with_sections(zval arg1, zval arg2, int callback`
`2539`	`2539`	`}`
`2540`	`2540`
`2541`	`2541`
`2542`		`-/* {{{ proto void parse_ini_file(string filename [, boolean process_sections])`
	`2542`	`+/* {{{ proto array parse_ini_file(string filename [, boolean process_sections])`
`2543`	`2543`	`Parse configuration file */`
`2544`	`2544`	`PHP_FUNCTION(parse_ini_file)`
`2545`	`2545`	`{`