bjori Mon Oct 2 07:58:14 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/posix posix.c
/php-src/ext/tidy tidy.c
/php-src/ext/standard basic_functions.c html.c
Log:
protos
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.5&r2=1.70.2.3.2.6&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.5
php-src/ext/posix/posix.c:1.70.2.3.2.6
--- php-src/ext/posix/posix.c:1.70.2.3.2.5 Sat Sep 16 17:41:57 2006
+++ php-src/ext/posix/posix.c Mon Oct 2 07:58:13 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.70.2.3.2.5 2006/09/16 17:41:57 nlopess Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.6 2006/10/02 07:58:13 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.5 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.6 $");
php_info_print_table_end();
}
/* }}} */
@@ -1064,7 +1064,7 @@
#endif
#ifdef HAVE_INITGROUPS
-/* {{{ proto bool initgroups(string name, int base_group_id)
+/* {{{ proto bool posix_initgroups(string name, int base_group_id)
Calculate the group access list for the user specified in name. */
PHP_FUNCTION(posix_initgroups)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.14&r2=1.66.2.8.2.15&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.14
php-src/ext/tidy/tidy.c:1.66.2.8.2.15
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.14 Fri Sep 15 14:57:52 2006
+++ php-src/ext/tidy/tidy.c Mon Oct 2 07:58:13 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.14 2006/09/15 14:57:52 nlopess Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.15 2006/10/02 07:58:13 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -988,7 +988,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.14 2006/09/15 14:57:52
nlopess Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.15 2006/10/02 07:58:13
bjori Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1312,7 +1312,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_is_xhtml()
+/* {{{ proto boolean tidy_is_xml()
Indicates if the document is a generic (non HTML/XHTML) XML document. */
static PHP_FUNCTION(tidy_is_xml)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.26&r2=1.725.2.31.2.27&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.26
php-src/ext/standard/basic_functions.c:1.725.2.31.2.27
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.26 Sun Oct 1
20:58:02 2006
+++ php-src/ext/standard/basic_functions.c Mon Oct 2 07:58:13 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.26 2006/10/01 20:58:02 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.27 2006/10/02 07:58:13 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -6295,6 +6295,8 @@
/* }}} */
#ifdef HAVE_GETLOADAVG
+/* {{{ proto array sys_getloadavg()
+ */
PHP_FUNCTION(sys_getloadavg)
{
double load[3];
@@ -6308,6 +6310,7 @@
add_index_double(return_value, 2, load[2]);
}
}
+/* }}} */
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.1&r2=1.111.2.2.2.2&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.1
php-src/ext/standard/html.c:1.111.2.2.2.2
--- php-src/ext/standard/html.c:1.111.2.2.2.1 Tue Aug 15 15:09:38 2006
+++ php-src/ext/standard/html.c Mon Oct 2 07:58:13 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.111.2.2.2.1 2006/08/15 15:09:38 tony2001 Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.2 2006/10/02 07:58:13 bjori Exp $ */
/*
* HTML entity resources:
@@ -1221,7 +1221,7 @@
}
/* }}} */
-/* {{{ proto string htmlspecialchars(string string [, int quote_style])
+/* {{{ proto string htmlspecialchars_decode(string string [, int quote_style])
Convert special HTML entities back to characters */
PHP_FUNCTION(htmlspecialchars_decode)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
