cvs: php4 / configuration-parser.y /ext/db/ db.c /ext/domxml/ domxml.c /ext/session/ session.c /ext/standard/ basic_functions.c exec.c file.c
filestat.c metaphone.c output.c
| From: | Hartmut Holzgraefe | Date: | Tue, 23 May 2000 23:13:02 +0000 |
| Subject: | cvs: php4 / configuration-parser.y /ext/db/ db.c /ext/domxml/ domxml.c /ext/session/ session.c /ext/standard/ basic_functions.c exec.c file.c filestat.c metaphone.c output.c |
||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15630@lists.php.net to get a copy of this message | ||
hholzgra Wed May 24 01:13:02 2000 EDT
Modified files:
/php4 configuration-parser.y
/php4/ext/db db.c
/php4/ext/domxml domxml.c
/php4/ext/session session.c
/php4/ext/standard basic_functions.c exec.c file.c filestat.c
metaphone.c output.c
Log:
another bunch of proto fixes
Index: php4/configuration-parser.y
diff -u php4/configuration-parser.y:1.45 php4/configuration-parser.y:1.46
--- php4/configuration-parser.y:1.45 Thu May 18 17:34:21 2000
+++ php4/configuration-parser.y Wed May 24 01:13:00 2000
@@ -19,7 +19,7 @@
-/* $Id: configuration-parser.y,v 1.45 2000/05/18 15:34:21 zeev Exp $ */
+/* $Id: configuration-parser.y,v 1.46 2000/05/23 23:13:00 hholzgra Exp $ */
#define DEBUG_CFG_PARSER 0
#include "php.h"
@@ -260,6 +260,8 @@
}
+/* {{{ proto void parse_ini_file(string filename)
+ Parse configuration file */
PHP_FUNCTION(parse_ini_file)
{
#ifdef ZTS
@@ -286,7 +288,7 @@
fclose(cfgin);
#endif
}
-
+/* }}} */
int php_shutdown_config(void)
{
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.37 php4/ext/db/db.c:1.38
--- php4/ext/db/db.c:1.37 Tue May 23 16:36:27 2000
+++ php4/ext/db/db.c Wed May 24 01:13:00 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.37 2000/05/23 14:36:27 andi Exp $ */
+/* $Id: db.c,v 1.38 2000/05/23 23:13:00 hholzgra Exp $ */
#define IS_EXT_MODULE
#ifdef COMPILE_DL_DB
# include "dl/phpdl.h"
@@ -740,7 +740,7 @@
return(ret);
}
-/* {{{ string dbmfirstkey(int dbm_identifier)
+/* {{{ proto string dbmfirstkey(int dbm_identifier)
Retrieves the first key from a dbm database */
PHP_FUNCTION(dbmfirstkey)
{
Index: php4/ext/domxml/domxml.c
diff -u php4/ext/domxml/domxml.c:1.36 php4/ext/domxml/domxml.c:1.37
--- php4/ext/domxml/domxml.c:1.36 Thu May 18 17:34:24 2000
+++ php4/ext/domxml/domxml.c Wed May 24 01:13:00 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: domxml.c,v 1.36 2000/05/18 15:34:24 zeev Exp $ */
+/* $Id: domxml.c,v 1.37 2000/05/23 23:13:00 hholzgra Exp $ */
#include "php.h"
@@ -380,7 +380,7 @@
}
/* }}} */
-/* {{{ proto class node(string name)
+/* {{{ proto class domxml_node(string name)
Creates node */
PHP_FUNCTION(domxml_node)
{
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.138 php4/ext/session/session.c:1.139
--- php4/ext/session/session.c:1.138 Tue May 23 11:33:46 2000
+++ php4/ext/session/session.c Wed May 24 01:13:00 2000
@@ -1152,7 +1152,7 @@
}
/* }}} */
-/* {{{ proto session_decode(string data)
+/* {{{ proto bool session_decode(string data)
Deserializes data and reinitializes the variables */
PHP_FUNCTION(session_decode)
{
@@ -1168,7 +1168,7 @@
}
/* }}} */
-/* {{{ proto session_start(void)
+/* {{{ proto bool session_start(void)
Begin session - reinitializes freezed variables, registers browsers etc */
PHP_FUNCTION(session_start)
{
@@ -1180,7 +1180,7 @@
}
/* }}} */
-/* {{{ proto session_destroy(void)
+/* {{{ proto void session_destroy(void)
Destroy the current session and all data associated with it */
PHP_FUNCTION(session_destroy)
{
@@ -1207,7 +1207,7 @@
}
#endif
-/* {{{ proto session_unset(void)
+/* {{{ proto void session_unset(void)
Unset all registered variables */
PHP_FUNCTION(session_unset)
{
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.193 php4/ext/standard/basic_functions.c:1.194
--- php4/ext/standard/basic_functions.c:1.193 Tue May 23 16:37:39 2000
+++ php4/ext/standard/basic_functions.c Wed May 24 01:13:01 2000
@@ -294,7 +294,7 @@
PHP_FE(register_shutdown_function, NULL)
PHP_FE(highlight_file, NULL)
- PHP_NAMED_FE(show_source, PHP_FN(highlight_file), NULL)
+ PHP_FALIAS(show_source, highlight_file , NULL)
PHP_FE(highlight_string, NULL)
PHP_FE(ini_get, NULL)
@@ -1967,7 +1967,7 @@
/* }}} */
-/* proto array get_extension_funcs(string extension_name)
+/* {{{ proto array get_extension_funcs(string extension_name)
Returns an array with the names of functions belonging to the named extension */
PHP_FUNCTION(get_extension_funcs)
{
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.32 php4/ext/standard/exec.c:1.33
--- php4/ext/standard/exec.c:1.32 Thu May 18 17:34:35 2000
+++ php4/ext/standard/exec.c Wed May 24 01:13:01 2000
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.32 2000/05/18 15:34:35 zeev Exp $ */
+/* $Id: exec.c,v 1.33 2000/05/23 23:13:01 hholzgra Exp $ */
#include <stdio.h>
#include "php.h"
@@ -324,7 +324,7 @@
return cmd;
}
-/* {{{ proto escapeshellcmd(string command)
+/* {{{ proto string escapeshellcmd(string command)
Escape shell metacharacters */
PHP_FUNCTION(escapeshellcmd)
{
@@ -344,7 +344,8 @@
}
/* }}} */
-
+/* {{{ proto string shell_exec(strng cmd)
+ What excatly is this variant for ??? */
PHP_FUNCTION(shell_exec)
{
FILE *in;
@@ -387,7 +388,7 @@
return_value->value.str.len = total_readbytes;
return_value->type = IS_STRING;
}
-
+/* }}} */
/*
* Local variables:
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.80 php4/ext/standard/file.c:1.81
--- php4/ext/standard/file.c:1.80 Tue May 23 19:02:21 2000
+++ php4/ext/standard/file.c Wed May 24 01:13:01 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.80 2000/05/23 17:02:21 andi Exp $ */
+/* $Id: file.c,v 1.81 2000/05/23 23:13:01 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -776,7 +776,7 @@
/* }}} */
-/* {{{ proto int socket_set_blocking(int socket descriptor, int mode)
+/* {{{ proto int set_socket_blocking(int socket descriptor, int mode)
Set blocking/non-blocking mode on a socket */
PHPAPI int php_set_sock_blocking(int socketd, int block)
{
Index: php4/ext/standard/filestat.c
diff -u php4/ext/standard/filestat.c:1.36 php4/ext/standard/filestat.c:1.37
--- php4/ext/standard/filestat.c:1.36 Thu May 18 17:34:35 2000
+++ php4/ext/standard/filestat.c Wed May 24 01:13:01 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.36 2000/05/18 15:34:35 zeev Exp $ */
+/* $Id: filestat.c,v 1.37 2000/05/23 23:13:01 hholzgra Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -122,8 +122,10 @@
efree (BG(CurrentStatFile));
}
return SUCCESS;
-}
+}
+/* {{{ proto double diskfreespace(string path)
+ Get free diskspace for filesystem that path is on */
PHP_FUNCTION(diskfreespace)
{
pval **path;
@@ -220,6 +222,7 @@
RETURN_DOUBLE(bytesfree);
}
+/* }}} */
/* {{{ proto bool chown(string filename, mixed user)
Change file owner */
Index: php4/ext/standard/metaphone.c
diff -u php4/ext/standard/metaphone.c:1.9 php4/ext/standard/metaphone.c:1.10
--- php4/ext/standard/metaphone.c:1.9 Thu May 18 17:34:35 2000
+++ php4/ext/standard/metaphone.c Wed May 24 01:13:01 2000
@@ -26,7 +26,8 @@
PHP_FUNCTION(metaphone);
-/* metaphone -- Breaks english phrases down into their phonemes. */
+/* {{{ proto string metaphone(string text, int phones)
+ Break english phrases down into their phonemes */
PHP_FUNCTION(metaphone)
{
pval **pstr, **pphones;
@@ -51,6 +52,7 @@
RETURN_FALSE;
}
}
+/* }}} */
/*
this is now the original code by Michael G Schwern:
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.21 php4/ext/standard/output.c:1.22
--- php4/ext/standard/output.c:1.21 Thu May 18 17:34:35 2000
+++ php4/ext/standard/output.c Wed May 24 01:13:01 2000
@@ -364,7 +364,7 @@
/* }}} */
-/* proto string ob_get_contents(void)
+/* {{{ proto string ob_get_contents(void)
Return the contents of the output buffer */
PHP_FUNCTION(ob_get_contents)
{