diff options
| -rw-r--r-- | ext/db/db.c | 2 | ||||
| -rw-r--r-- | ext/domxml/domxml.c | 2 | ||||
| -rw-r--r-- | ext/session/session.c | 8 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/exec.c | 7 | ||||
| -rw-r--r-- | ext/standard/file.c | 2 | ||||
| -rw-r--r-- | ext/standard/filestat.c | 5 | ||||
| -rw-r--r-- | ext/standard/metaphone.c | 4 | ||||
| -rw-r--r-- | ext/standard/output.c | 2 | ||||
| -rw-r--r-- | main/configuration-parser.y | 4 | ||||
| -rw-r--r-- | main/output.c | 2 |
11 files changed, 25 insertions, 17 deletions
diff --git a/ext/db/db.c b/ext/db/db.c index ed64c9c14a..2d5f47e475 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -740,7 +740,7 @@ int php_dbm_delete(dbm_info *info, char *key) { return(ret); } -/* {{{ string dbmfirstkey(int dbm_identifier) +/* {{{ proto string dbmfirstkey(int dbm_identifier) Retrieves the first key from a dbm database */ PHP_FUNCTION(dbmfirstkey) { diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c index 15cda6b9ec..b93441d678 100644 --- a/ext/domxml/domxml.c +++ b/ext/domxml/domxml.c @@ -380,7 +380,7 @@ PHP_FUNCTION(domxml_attrname) } /* }}} */ -/* {{{ proto class node(string name) +/* {{{ proto class domxml_node(string name) Creates node */ PHP_FUNCTION(domxml_node) { diff --git a/ext/session/session.c b/ext/session/session.c index 8c72b53d55..32c3db5c61 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1152,7 +1152,7 @@ PHP_FUNCTION(session_encode) } /* }}} */ -/* {{{ 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 @@ PHP_FUNCTION(session_decode) } /* }}} */ -/* {{{ 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 @@ PHP_FUNCTION(session_start) } /* }}} */ -/* {{{ 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 @@ void session_adapt_uris(const char *src, uint srclen, char **new, uint *newlen) } #endif -/* {{{ proto session_unset(void) +/* {{{ proto void session_unset(void) Unset all registered variables */ PHP_FUNCTION(session_unset) { diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 8180d0e3c7..895ebddf7f 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -294,7 +294,7 @@ function_entry basic_functions[] = { 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 @@ PHP_FUNCTION(extension_loaded) /* }}} */ -/* 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) { diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 86fd53ab5b..2b581d813a 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -324,7 +324,7 @@ char * php_escape_shell_cmd(char *str) { return cmd; } -/* {{{ proto escapeshellcmd(string command) +/* {{{ proto string escapeshellcmd(string command) Escape shell metacharacters */ PHP_FUNCTION(escapeshellcmd) { @@ -344,7 +344,8 @@ PHP_FUNCTION(escapeshellcmd) } /* }}} */ - +/* {{{ proto string shell_exec(strng cmd) + What excatly is this variant for ??? */ PHP_FUNCTION(shell_exec) { FILE *in; @@ -387,7 +388,7 @@ PHP_FUNCTION(shell_exec) return_value->value.str.len = total_readbytes; return_value->type = IS_STRING; } - +/* }}} */ /* * Local variables: diff --git a/ext/standard/file.c b/ext/standard/file.c index d129f6b892..6ab56ed81d 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -776,7 +776,7 @@ PHP_FUNCTION(feof) /* }}} */ -/* {{{ 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) { diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 3ced291cf0..9e3bad8b3a 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -122,8 +122,10 @@ PHP_RSHUTDOWN_FUNCTION(filestat) 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 @@ PHP_FUNCTION(diskfreespace) RETURN_DOUBLE(bytesfree); } +/* }}} */ /* {{{ proto bool chown(string filename, mixed user) Change file owner */ diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index 891feef574..fe9eae97fc 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -26,7 +26,8 @@ static int metaphone(char *word, int max_phonemes, char **phoned_word, int tradi 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 @@ PHP_FUNCTION(metaphone) RETURN_FALSE; } } +/* }}} */ /* this is now the original code by Michael G Schwern: diff --git a/ext/standard/output.c b/ext/standard/output.c index f778ca33bc..d489f42cc2 100644 --- a/ext/standard/output.c +++ b/ext/standard/output.c @@ -364,7 +364,7 @@ PHP_FUNCTION(ob_end_clean) /* }}} */ -/* proto string ob_get_contents(void) +/* {{{ proto string ob_get_contents(void) Return the contents of the output buffer */ PHP_FUNCTION(ob_get_contents) { diff --git a/main/configuration-parser.y b/main/configuration-parser.y index 7ccbaeb4fa..a201ce5eb4 100644 --- a/main/configuration-parser.y +++ b/main/configuration-parser.y @@ -260,6 +260,8 @@ PHP_MINIT_FUNCTION(browscap) } +/* {{{ proto void parse_ini_file(string filename) + Parse configuration file */ PHP_FUNCTION(parse_ini_file) { #ifdef ZTS @@ -286,7 +288,7 @@ PHP_FUNCTION(parse_ini_file) fclose(cfgin); #endif } - +/* }}} */ int php_shutdown_config(void) { diff --git a/main/output.c b/main/output.c index f778ca33bc..d489f42cc2 100644 --- a/main/output.c +++ b/main/output.c @@ -364,7 +364,7 @@ PHP_FUNCTION(ob_end_clean) /* }}} */ -/* proto string ob_get_contents(void) +/* {{{ proto string ob_get_contents(void) Return the contents of the output buffer */ PHP_FUNCTION(ob_get_contents) { |