cvs: php-src /ext/bz2 bz2.c php_bz2.h /ext/ctype ctype.c php_ctype.h /ext/pspell php_pspell.h pspell.c
| From: | Nuno Lopes | Date: | Mon, 14 Aug 2006 14:54:19 +0000 |
| Subject: | cvs: php-src /ext/bz2 bz2.c php_bz2.h /ext/ctype ctype.c php_ctype.h /ext/pspell php_pspell.h pspell.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39963@lists.php.net to get a copy of this message | ||
nlopess Mon Aug 14 14:54:19 2006 UTC
Modified files:
/php-src/ext/bz2 bz2.c php_bz2.h
/php-src/ext/ctype ctype.c php_ctype.h
/php-src/ext/pspell php_pspell.h pspell.c
Log:
MFB: a few more static keywording
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.24&r2=1.25&diff_format=u Index: php-src/ext/bz2/bz2.c diff -u php-src/ext/bz2/bz2.c:1.24 php-src/ext/bz2/bz2.c:1.25 --- php-src/ext/bz2/bz2.c:1.24 Mon Jun 26 21:13:22 2006 +++ php-src/ext/bz2/bz2.c Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.24 2006/06/26 21:13:22 tony2001 Exp $ */ +/* $Id: bz2.c,v 1.25 2006/08/14 14:54:19 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,7 +83,7 @@ /* }}} */ -zend_function_entry bz2_functions[] = { +static zend_function_entry bz2_functions[] = { PHP_FE(bzopen, arginfo_bzopen) PHP_FE(bzread, arginfo_bzread) PHP_FALIAS(bzwrite, fwrite, NULL) @@ -167,7 +167,7 @@ } /* }}} */ -php_stream_ops php_stream_bz2io_ops = { +static php_stream_ops php_stream_bz2io_ops = { php_bz2iop_write, php_bz2iop_read, php_bz2iop_close, php_bz2iop_flush, "BZip2", @@ -272,7 +272,7 @@ NULL /* rmdir */ }; -php_stream_wrapper php_stream_bzip2_wrapper = { +static php_stream_wrapper php_stream_bzip2_wrapper = { &bzip2_stream_wops, NULL, 0 /* is_url */ @@ -280,14 +280,14 @@ static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int); -PHP_MINIT_FUNCTION(bz2) +static PHP_MINIT_FUNCTION(bz2) { php_register_url_stream_wrapper("compress.bzip2", &php_stream_bzip2_wrapper TSRMLS_CC); php_stream_filter_register_factory("bzip2.*", &php_bz2_filter_factory TSRMLS_CC); return SUCCESS; } -PHP_MSHUTDOWN_FUNCTION(bz2) +static PHP_MSHUTDOWN_FUNCTION(bz2) { php_unregister_url_stream_wrapper("compress.bzip2" TSRMLS_CC); php_stream_filter_unregister_factory("bzip2.*" TSRMLS_CC); @@ -295,7 +295,7 @@ return SUCCESS; } -PHP_MINFO_FUNCTION(bz2) +static PHP_MINFO_FUNCTION(bz2) { php_info_print_table_start(); php_info_print_table_row(2, "BZip2 Support", "Enabled"); @@ -307,7 +307,7 @@ /* {{{ proto string bzread(resource bz[, int length]) Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */ -PHP_FUNCTION(bzread) +static PHP_FUNCTION(bzread) { zval *bz; long len = 1024; @@ -341,7 +341,7 @@ /* {{{ proto resource bzopen(string|int file|fp, string mode) Opens a new BZip2 stream */ -PHP_FUNCTION(bzopen) +static PHP_FUNCTION(bzopen) { zval **file, /* The file to open */ **mode; /* The mode to open the stream with */ @@ -429,7 +429,7 @@ /* {{{ proto int bzerrno(resource bz) Returns the error number */ -PHP_FUNCTION(bzerrno) +static PHP_FUNCTION(bzerrno) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO); } @@ -437,7 +437,7 @@ /* {{{ proto string bzerrstr(resource bz) Returns the error string */ -PHP_FUNCTION(bzerrstr) +static PHP_FUNCTION(bzerrstr) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR); } @@ -445,7 +445,7 @@ /* {{{ proto array bzerror(resource bz) Returns the error number and error string in an associative array */ -PHP_FUNCTION(bzerror) +static PHP_FUNCTION(bzerror) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH); } @@ -453,7 +453,7 @@ /* {{{ proto string bzcompress(string source [, int blocksize100k [, int workfactor]]) Compresses a string into BZip2 encoded data */ -PHP_FUNCTION(bzcompress) +static PHP_FUNCTION(bzcompress) { zval **source, /* Source data to compress */ **zblock_size, /* Optional block size to use */ @@ -511,7 +511,7 @@ /* {{{ proto string bzdecompress(string source [, int small]) Decompresses BZip2 compressed data */ -PHP_FUNCTION(bzdecompress) +static PHP_FUNCTION(bzdecompress) { char *source, *dest; int source_len, error; http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/bz2/php_bz2.h diff -u php-src/ext/bz2/php_bz2.h:1.8 php-src/ext/bz2/php_bz2.h:1.9 --- php-src/ext/bz2/php_bz2.h:1.8 Sun Jan 1 13:09:48 2006 +++ php-src/ext/bz2/php_bz2.h Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_bz2.h,v 1.8 2006/01/01 13:09:48 sniper Exp $ */ +/* $Id: php_bz2.h,v 1.9 2006/08/14 14:54:19 nlopess Exp $ */ #ifndef PHP_BZ2_H #define PHP_BZ2_H @@ -29,16 +29,16 @@ /* Bzip2 includes */ #include <bzlib.h> -PHP_MINIT_FUNCTION(bz2); -PHP_MSHUTDOWN_FUNCTION(bz2); -PHP_MINFO_FUNCTION(bz2); -PHP_FUNCTION(bzopen); -PHP_FUNCTION(bzread); -PHP_FUNCTION(bzerrno); -PHP_FUNCTION(bzerrstr); -PHP_FUNCTION(bzerror); -PHP_FUNCTION(bzcompress); -PHP_FUNCTION(bzdecompress); +static PHP_MINIT_FUNCTION(bz2); +static PHP_MSHUTDOWN_FUNCTION(bz2); +static PHP_MINFO_FUNCTION(bz2); +static PHP_FUNCTION(bzopen); +static PHP_FUNCTION(bzread); +static PHP_FUNCTION(bzerrno); +static PHP_FUNCTION(bzerrstr); +static PHP_FUNCTION(bzerror); +static PHP_FUNCTION(bzcompress); +static PHP_FUNCTION(bzdecompress); #else #define phpext_bz2_ptr NULL http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.40&r2=1.41&diff_format=u Index: php-src/ext/ctype/ctype.c diff -u php-src/ext/ctype/ctype.c:1.40 php-src/ext/ctype/ctype.c:1.41 --- php-src/ext/ctype/ctype.c:1.40 Sat Jun 10 22:59:39 2006 +++ php-src/ext/ctype/ctype.c Mon Aug 14 14:54:19 2006 @@ -101,7 +101,7 @@ /* {{{ ctype_functions[] * Every user visible function must have an entry in ctype_functions[]. */ -zend_function_entry ctype_functions[] = { +static zend_function_entry ctype_functions[] = { PHP_FE(ctype_alnum, arginfo_ctype_alnum) PHP_FE(ctype_alpha, arginfo_ctype_alpha) PHP_FE(ctype_cntrl, arginfo_ctype_cntrl) @@ -139,7 +139,7 @@ /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(ctype) +static PHP_MINFO_FUNCTION(ctype) { php_info_print_table_start(); php_info_print_table_row(2, "ctype functions", "enabled"); @@ -196,7 +196,7 @@ /* {{{ proto bool ctype_alnum(mixed c) Checks for alphanumeric character(s) */ -PHP_FUNCTION(ctype_alnum) +static PHP_FUNCTION(ctype_alnum) { CTYPE(isalnum); } @@ -204,7 +204,7 @@ /* {{{ proto bool ctype_alpha(mixed c) Checks for alphabetic character(s) */ -PHP_FUNCTION(ctype_alpha) +static PHP_FUNCTION(ctype_alpha) { CTYPE(isalpha); } @@ -212,7 +212,7 @@ /* {{{ proto bool ctype_cntrl(mixed c) Checks for control character(s) */ -PHP_FUNCTION(ctype_cntrl) +static PHP_FUNCTION(ctype_cntrl) { CTYPE(iscntrl); } @@ -220,7 +220,7 @@ /* {{{ proto bool ctype_digit(mixed c) Checks for numeric character(s) */ -PHP_FUNCTION(ctype_digit) +static PHP_FUNCTION(ctype_digit) { CTYPE(isdigit); } @@ -228,7 +228,7 @@ /* {{{ proto bool ctype_lower(mixed c) Checks for lowercase character(s) */ -PHP_FUNCTION(ctype_lower) +static PHP_FUNCTION(ctype_lower) { CTYPE(islower); } @@ -236,7 +236,7 @@ /* {{{ proto bool ctype_graph(mixed c) Checks for any printable character(s) except space */ -PHP_FUNCTION(ctype_graph) +static PHP_FUNCTION(ctype_graph) { CTYPE(isgraph); } @@ -244,7 +244,7 @@ /* {{{ proto bool ctype_print(mixed c) Checks for printable character(s) */ -PHP_FUNCTION(ctype_print) +static PHP_FUNCTION(ctype_print) { CTYPE(isprint); } @@ -252,7 +252,7 @@ /* {{{ proto bool ctype_punct(mixed c) Checks for any printable character which is not whitespace or an alphanumeric character */ -PHP_FUNCTION(ctype_punct) +static PHP_FUNCTION(ctype_punct) { CTYPE(ispunct); } @@ -260,7 +260,7 @@ /* {{{ proto bool ctype_space(mixed c) Checks for whitespace character(s)*/ -PHP_FUNCTION(ctype_space) +static PHP_FUNCTION(ctype_space) { CTYPE(isspace); } @@ -268,7 +268,7 @@ /* {{{ proto bool ctype_upper(mixed c) Checks for uppercase character(s) */ -PHP_FUNCTION(ctype_upper) +static PHP_FUNCTION(ctype_upper) { CTYPE(isupper); } @@ -276,7 +276,7 @@ /* {{{ proto bool ctype_xdigit(mixed c) Checks for character(s) representing a hexadecimal digit */ -PHP_FUNCTION(ctype_xdigit) +static PHP_FUNCTION(ctype_xdigit) { CTYPE(isxdigit); } http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/php_ctype.h?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/ctype/php_ctype.h diff -u php-src/ext/ctype/php_ctype.h:1.13 php-src/ext/ctype/php_ctype.h:1.14 --- php-src/ext/ctype/php_ctype.h:1.13 Sun Jan 1 13:09:48 2006 +++ php-src/ext/ctype/php_ctype.h Mon Aug 14 14:54:19 2006 @@ -33,23 +33,23 @@ #define PHP_CTYPE_API #endif -PHP_MINIT_FUNCTION(ctype); -PHP_MSHUTDOWN_FUNCTION(ctype); -PHP_RINIT_FUNCTION(ctype); -PHP_RSHUTDOWN_FUNCTION(ctype); -PHP_MINFO_FUNCTION(ctype); - -PHP_FUNCTION(ctype_alnum); -PHP_FUNCTION(ctype_alpha); -PHP_FUNCTION(ctype_cntrl); -PHP_FUNCTION(ctype_digit); -PHP_FUNCTION(ctype_lower); -PHP_FUNCTION(ctype_graph); -PHP_FUNCTION(ctype_print); -PHP_FUNCTION(ctype_punct); -PHP_FUNCTION(ctype_space); -PHP_FUNCTION(ctype_upper); -PHP_FUNCTION(ctype_xdigit); +static PHP_MINIT_FUNCTION(ctype); +static PHP_MSHUTDOWN_FUNCTION(ctype); +static PHP_RINIT_FUNCTION(ctype); +static PHP_RSHUTDOWN_FUNCTION(ctype); +static PHP_MINFO_FUNCTION(ctype); + +static PHP_FUNCTION(ctype_alnum); +static PHP_FUNCTION(ctype_alpha); +static PHP_FUNCTION(ctype_cntrl); +static PHP_FUNCTION(ctype_digit); +static PHP_FUNCTION(ctype_lower); +static PHP_FUNCTION(ctype_graph); +static PHP_FUNCTION(ctype_print); +static PHP_FUNCTION(ctype_punct); +static PHP_FUNCTION(ctype_space); +static PHP_FUNCTION(ctype_upper); +static PHP_FUNCTION(ctype_xdigit); /* Declare any global variables you may need between the BEGIN http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/php_pspell.h?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/pspell/php_pspell.h diff -u php-src/ext/pspell/php_pspell.h:1.16 php-src/ext/pspell/php_pspell.h:1.17 --- php-src/ext/pspell/php_pspell.h:1.16 Sun Jan 1 13:09:53 2006 +++ php-src/ext/pspell/php_pspell.h Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pspell.h,v 1.16 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: php_pspell.h,v 1.17 2006/08/14 14:54:19 nlopess Exp $ */ #ifndef _PSPELL_H #define _PSPELL_H @@ -24,27 +24,27 @@ extern zend_module_entry pspell_module_entry; #define pspell_module_ptr &pspell_module_entry -PHP_MINIT_FUNCTION(pspell); -PHP_MINFO_FUNCTION(pspell); -PHP_FUNCTION(pspell_new); -PHP_FUNCTION(pspell_new_personal); -PHP_FUNCTION(pspell_new_config); -PHP_FUNCTION(pspell_check); -PHP_FUNCTION(pspell_suggest); -PHP_FUNCTION(pspell_store_replacement); -PHP_FUNCTION(pspell_add_to_personal); -PHP_FUNCTION(pspell_add_to_session); -PHP_FUNCTION(pspell_clear_session); -PHP_FUNCTION(pspell_save_wordlist); -PHP_FUNCTION(pspell_config_create); -PHP_FUNCTION(pspell_config_runtogether); -PHP_FUNCTION(pspell_config_mode); -PHP_FUNCTION(pspell_config_ignore); -PHP_FUNCTION(pspell_config_personal); -PHP_FUNCTION(pspell_config_dict_dir); -PHP_FUNCTION(pspell_config_data_dir); -PHP_FUNCTION(pspell_config_repl); -PHP_FUNCTION(pspell_config_save_repl); +static PHP_MINIT_FUNCTION(pspell); +static PHP_MINFO_FUNCTION(pspell); +static PHP_FUNCTION(pspell_new); +static PHP_FUNCTION(pspell_new_personal); +static PHP_FUNCTION(pspell_new_config); +static PHP_FUNCTION(pspell_check); +static PHP_FUNCTION(pspell_suggest); +static PHP_FUNCTION(pspell_store_replacement); +static PHP_FUNCTION(pspell_add_to_personal); +static PHP_FUNCTION(pspell_add_to_session); +static PHP_FUNCTION(pspell_clear_session); +static PHP_FUNCTION(pspell_save_wordlist); +static PHP_FUNCTION(pspell_config_create); +static PHP_FUNCTION(pspell_config_runtogether); +static PHP_FUNCTION(pspell_config_mode); +static PHP_FUNCTION(pspell_config_ignore); +static PHP_FUNCTION(pspell_config_personal); +static PHP_FUNCTION(pspell_config_dict_dir); +static PHP_FUNCTION(pspell_config_data_dir); +static PHP_FUNCTION(pspell_config_repl); +static PHP_FUNCTION(pspell_config_save_repl); #else #define pspell_module_ptr NULL #endif http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.50&r2=1.51&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.50 php-src/ext/pspell/pspell.c:1.51 --- php-src/ext/pspell/pspell.c:1.50 Sun Feb 19 00:55:20 2006 +++ php-src/ext/pspell/pspell.c Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.50 2006/02/19 00:55:20 andi Exp $ */ +/* $Id: pspell.c,v 1.51 2006/08/14 14:54:19 nlopess Exp $ */ #define IS_EXT_MODULE @@ -119,7 +119,7 @@ /* {{{ PHP_MINIT_FUNCTION */ -PHP_MINIT_FUNCTION(pspell) +static PHP_MINIT_FUNCTION(pspell) { REGISTER_LONG_CONSTANT("PSPELL_FAST", PSPELL_FAST, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("PSPELL_NORMAL", PSPELL_NORMAL, CONST_PERSISTENT | CONST_CS); @@ -133,7 +133,7 @@ /* {{{ proto int pspell_new(string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) Load a dictionary */ -PHP_FUNCTION(pspell_new) +static PHP_FUNCTION(pspell_new) { zval **language,**spelling,**jargon,**encoding,**pmode; long mode = 0L, speed = 0L; @@ -236,7 +236,7 @@ /* {{{ proto int pspell_new_personal(string personal, string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) Load a dictionary with a personal wordlist*/ -PHP_FUNCTION(pspell_new_personal) +static PHP_FUNCTION(pspell_new_personal) { zval **personal, **language,**spelling,**jargon,**encoding,**pmode; long mode = 0L, speed = 0L; @@ -348,7 +348,7 @@ /* {{{ proto int pspell_new_config(int config) Load a dictionary based on the given config */ -PHP_FUNCTION(pspell_new_config) +static PHP_FUNCTION(pspell_new_config) { int type; zval **conf; @@ -381,7 +381,7 @@ /* {{{ proto bool pspell_check(int pspell, string word) Returns true if word is valid */ -PHP_FUNCTION(pspell_check) +static PHP_FUNCTION(pspell_check) { int type; zval **scin,**word; @@ -407,7 +407,7 @@ /* {{{ proto array pspell_suggest(int pspell, string word) Returns array of suggestions */ -PHP_FUNCTION(pspell_suggest) +static PHP_FUNCTION(pspell_suggest) { zval **scin, **word; int argc; @@ -442,7 +442,7 @@ /* {{{ proto bool pspell_store_replacement(int pspell, string misspell, string correct) Notify the dictionary of a user-selected replacement */ -PHP_FUNCTION(pspell_store_replacement) +static PHP_FUNCTION(pspell_store_replacement) { int type; zval **scin,**miss,**corr; @@ -470,7 +470,7 @@ /* {{{ proto bool pspell_add_to_personal(int pspell, string word) Adds a word to a personal list */ -PHP_FUNCTION(pspell_add_to_personal) +static PHP_FUNCTION(pspell_add_to_personal) { int type; zval **scin,**word; @@ -502,7 +502,7 @@ /* {{{ proto bool pspell_add_to_session(int pspell, string word) Adds a word to the current session */ -PHP_FUNCTION(pspell_add_to_session) +static PHP_FUNCTION(pspell_add_to_session) { int type; zval **scin,**word; @@ -534,7 +534,7 @@ /* {{{ proto bool pspell_clear_session(int pspell) Clears the current session */ -PHP_FUNCTION(pspell_clear_session) +static PHP_FUNCTION(pspell_clear_session) { int type; zval **scin; @@ -560,7 +560,7 @@ /* {{{ proto bool pspell_save_wordlist(int pspell) Saves the current (personal) wordlist */ -PHP_FUNCTION(pspell_save_wordlist) +static PHP_FUNCTION(pspell_save_wordlist) { int type; zval **scin; @@ -588,7 +588,7 @@ /* {{{ proto int pspell_config_create(string language [, string spelling [, string jargon [, string encoding]]]) Create a new config to be used later to create a manager */ -PHP_FUNCTION(pspell_config_create) +static PHP_FUNCTION(pspell_config_create) { zval **language,**spelling,**jargon,**encoding; int argc; @@ -663,7 +663,7 @@ /* {{{ proto bool pspell_config_runtogether(int conf, bool runtogether) Consider run-together words as valid components */ -PHP_FUNCTION(pspell_config_runtogether) +static PHP_FUNCTION(pspell_config_runtogether) { int type; zval **conf, **runtogether; @@ -687,7 +687,7 @@ /* {{{ proto bool pspell_config_mode(int conf, long mode) Select mode for config (PSPELL_FAST, PSPELL_NORMAL or PSPELL_BAD_SPELLERS) */ -PHP_FUNCTION(pspell_config_mode) +static PHP_FUNCTION(pspell_config_mode) { int type; zval **conf, **mode; @@ -719,7 +719,7 @@ /* {{{ proto bool pspell_config_ignore(int conf, int ignore) Ignore words <= n chars */ -PHP_FUNCTION(pspell_config_ignore) +static PHP_FUNCTION(pspell_config_ignore) { int type; zval **conf, **pignore; @@ -789,7 +789,7 @@ /* {{{ proto bool pspell_config_personal(int conf, string personal) Use a personal dictionary for this config */ -PHP_FUNCTION(pspell_config_personal) +static PHP_FUNCTION(pspell_config_personal) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "personal"); } @@ -797,7 +797,7 @@ /* {{{ proto bool pspell_config_dict_dir(int conf, string directory) location of the main word list */ -PHP_FUNCTION(pspell_config_dict_dir) +static PHP_FUNCTION(pspell_config_dict_dir) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "dict-dir"); } @@ -805,7 +805,7 @@ /* {{{ proto bool pspell_config_data_dir(int conf, string directory) location of language data files */ -PHP_FUNCTION(pspell_config_data_dir) +static PHP_FUNCTION(pspell_config_data_dir) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "data-dir"); } @@ -813,7 +813,7 @@ /* {{{ proto bool pspell_config_repl(int conf, string repl) Use a personal dictionary with replacement pairs for this config */ -PHP_FUNCTION(pspell_config_repl) +static PHP_FUNCTION(pspell_config_repl) { int type; zval **conf, **repl; @@ -844,7 +844,7 @@ /* {{{ proto bool pspell_config_save_repl(int conf, bool save) Save replacement pairs when personal list is saved for this config */ -PHP_FUNCTION(pspell_config_save_repl) +static PHP_FUNCTION(pspell_config_save_repl) { int type; zval **conf, **save; @@ -868,7 +868,7 @@ /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(pspell) +static PHP_MINFO_FUNCTION(pspell) { php_info_print_table_start(); php_info_print_table_row(2, "PSpell Support", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.24&r2=1.25&diff_format=u Index: php-src/ext/bz2/bz2.c diff -u php-src/ext/bz2/bz2.c:1.24 php-src/ext/bz2/bz2.c:1.25 --- php-src/ext/bz2/bz2.c:1.24 Mon Jun 26 21:13:22 2006 +++ php-src/ext/bz2/bz2.c Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.24 2006/06/26 21:13:22 tony2001 Exp $ */ +/* $Id: bz2.c,v 1.25 2006/08/14 14:54:19 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,7 +83,7 @@ /* }}} */ -zend_function_entry bz2_functions[] = { +static zend_function_entry bz2_functions[] = { PHP_FE(bzopen, arginfo_bzopen) PHP_FE(bzread, arginfo_bzread) PHP_FALIAS(bzwrite, fwrite, NULL) @@ -167,7 +167,7 @@ } /* }}} */ -php_stream_ops php_stream_bz2io_ops = { +static php_stream_ops php_stream_bz2io_ops = { php_bz2iop_write, php_bz2iop_read, php_bz2iop_close, php_bz2iop_flush, "BZip2", @@ -272,7 +272,7 @@ NULL /* rmdir */ }; -php_stream_wrapper php_stream_bzip2_wrapper = { +static php_stream_wrapper php_stream_bzip2_wrapper = { &bzip2_stream_wops, NULL, 0 /* is_url */ @@ -280,14 +280,14 @@ static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int); -PHP_MINIT_FUNCTION(bz2) +static PHP_MINIT_FUNCTION(bz2) { php_register_url_stream_wrapper("compress.bzip2", &php_stream_bzip2_wrapper TSRMLS_CC); php_stream_filter_register_factory("bzip2.*", &php_bz2_filter_factory TSRMLS_CC); return SUCCESS; } -PHP_MSHUTDOWN_FUNCTION(bz2) +static PHP_MSHUTDOWN_FUNCTION(bz2) { php_unregister_url_stream_wrapper("compress.bzip2" TSRMLS_CC); php_stream_filter_unregister_factory("bzip2.*" TSRMLS_CC); @@ -295,7 +295,7 @@ return SUCCESS; } -PHP_MINFO_FUNCTION(bz2) +static PHP_MINFO_FUNCTION(bz2) { php_info_print_table_start(); php_info_print_table_row(2, "BZip2 Support", "Enabled"); @@ -307,7 +307,7 @@ /* {{{ proto string bzread(resource bz[, int length]) Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */ -PHP_FUNCTION(bzread) +static PHP_FUNCTION(bzread) { zval *bz; long len = 1024; @@ -341,7 +341,7 @@ /* {{{ proto resource bzopen(string|int file|fp, string mode) Opens a new BZip2 stream */ -PHP_FUNCTION(bzopen) +static PHP_FUNCTION(bzopen) { zval **file, /* The file to open */ **mode; /* The mode to open the stream with */ @@ -429,7 +429,7 @@ /* {{{ proto int bzerrno(resource bz) Returns the error number */ -PHP_FUNCTION(bzerrno) +static PHP_FUNCTION(bzerrno) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO); } @@ -437,7 +437,7 @@ /* {{{ proto string bzerrstr(resource bz) Returns the error string */ -PHP_FUNCTION(bzerrstr) +static PHP_FUNCTION(bzerrstr) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR); } @@ -445,7 +445,7 @@ /* {{{ proto array bzerror(resource bz) Returns the error number and error string in an associative array */ -PHP_FUNCTION(bzerror) +static PHP_FUNCTION(bzerror) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH); } @@ -453,7 +453,7 @@ /* {{{ proto string bzcompress(string source [, int blocksize100k [, int workfactor]]) Compresses a string into BZip2 encoded data */ -PHP_FUNCTION(bzcompress) +static PHP_FUNCTION(bzcompress) { zval **source, /* Source data to compress */ **zblock_size, /* Optional block size to use */ @@ -511,7 +511,7 @@ /* {{{ proto string bzdecompress(string source [, int small]) Decompresses BZip2 compressed data */ -PHP_FUNCTION(bzdecompress) +static PHP_FUNCTION(bzdecompress) { char *source, *dest; int source_len, error; http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/bz2/php_bz2.h diff -u php-src/ext/bz2/php_bz2.h:1.8 php-src/ext/bz2/php_bz2.h:1.9 --- php-src/ext/bz2/php_bz2.h:1.8 Sun Jan 1 13:09:48 2006 +++ php-src/ext/bz2/php_bz2.h Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_bz2.h,v 1.8 2006/01/01 13:09:48 sniper Exp $ */ +/* $Id: php_bz2.h,v 1.9 2006/08/14 14:54:19 nlopess Exp $ */ #ifndef PHP_BZ2_H #define PHP_BZ2_H @@ -29,16 +29,16 @@ /* Bzip2 includes */ #include <bzlib.h> -PHP_MINIT_FUNCTION(bz2); -PHP_MSHUTDOWN_FUNCTION(bz2); -PHP_MINFO_FUNCTION(bz2); -PHP_FUNCTION(bzopen); -PHP_FUNCTION(bzread); -PHP_FUNCTION(bzerrno); -PHP_FUNCTION(bzerrstr); -PHP_FUNCTION(bzerror); -PHP_FUNCTION(bzcompress); -PHP_FUNCTION(bzdecompress); +static PHP_MINIT_FUNCTION(bz2); +static PHP_MSHUTDOWN_FUNCTION(bz2); +static PHP_MINFO_FUNCTION(bz2); +static PHP_FUNCTION(bzopen); +static PHP_FUNCTION(bzread); +static PHP_FUNCTION(bzerrno); +static PHP_FUNCTION(bzerrstr); +static PHP_FUNCTION(bzerror); +static PHP_FUNCTION(bzcompress); +static PHP_FUNCTION(bzdecompress); #else #define phpext_bz2_ptr NULL http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.40&r2=1.41&diff_format=u Index: php-src/ext/ctype/ctype.c diff -u php-src/ext/ctype/ctype.c:1.40 php-src/ext/ctype/ctype.c:1.41 --- php-src/ext/ctype/ctype.c:1.40 Sat Jun 10 22:59:39 2006 +++ php-src/ext/ctype/ctype.c Mon Aug 14 14:54:19 2006 @@ -101,7 +101,7 @@ /* {{{ ctype_functions[] * Every user visible function must have an entry in ctype_functions[]. */ -zend_function_entry ctype_functions[] = { +static zend_function_entry ctype_functions[] = { PHP_FE(ctype_alnum, arginfo_ctype_alnum) PHP_FE(ctype_alpha, arginfo_ctype_alpha) PHP_FE(ctype_cntrl, arginfo_ctype_cntrl) @@ -139,7 +139,7 @@ /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(ctype) +static PHP_MINFO_FUNCTION(ctype) { php_info_print_table_start(); php_info_print_table_row(2, "ctype functions", "enabled"); @@ -196,7 +196,7 @@ /* {{{ proto bool ctype_alnum(mixed c) Checks for alphanumeric character(s) */ -PHP_FUNCTION(ctype_alnum) +static PHP_FUNCTION(ctype_alnum) { CTYPE(isalnum); } @@ -204,7 +204,7 @@ /* {{{ proto bool ctype_alpha(mixed c) Checks for alphabetic character(s) */ -PHP_FUNCTION(ctype_alpha) +static PHP_FUNCTION(ctype_alpha) { CTYPE(isalpha); } @@ -212,7 +212,7 @@ /* {{{ proto bool ctype_cntrl(mixed c) Checks for control character(s) */ -PHP_FUNCTION(ctype_cntrl) +static PHP_FUNCTION(ctype_cntrl) { CTYPE(iscntrl); } @@ -220,7 +220,7 @@ /* {{{ proto bool ctype_digit(mixed c) Checks for numeric character(s) */ -PHP_FUNCTION(ctype_digit) +static PHP_FUNCTION(ctype_digit) { CTYPE(isdigit); } @@ -228,7 +228,7 @@ /* {{{ proto bool ctype_lower(mixed c) Checks for lowercase character(s) */ -PHP_FUNCTION(ctype_lower) +static PHP_FUNCTION(ctype_lower) { CTYPE(islower); } @@ -236,7 +236,7 @@ /* {{{ proto bool ctype_graph(mixed c) Checks for any printable character(s) except space */ -PHP_FUNCTION(ctype_graph) +static PHP_FUNCTION(ctype_graph) { CTYPE(isgraph); } @@ -244,7 +244,7 @@ /* {{{ proto bool ctype_print(mixed c) Checks for printable character(s) */ -PHP_FUNCTION(ctype_print) +static PHP_FUNCTION(ctype_print) { CTYPE(isprint); } @@ -252,7 +252,7 @@ /* {{{ proto bool ctype_punct(mixed c) Checks for any printable character which is not whitespace or an alphanumeric character */ -PHP_FUNCTION(ctype_punct) +static PHP_FUNCTION(ctype_punct) { CTYPE(ispunct); } @@ -260,7 +260,7 @@ /* {{{ proto bool ctype_space(mixed c) Checks for whitespace character(s)*/ -PHP_FUNCTION(ctype_space) +static PHP_FUNCTION(ctype_space) { CTYPE(isspace); } @@ -268,7 +268,7 @@ /* {{{ proto bool ctype_upper(mixed c) Checks for uppercase character(s) */ -PHP_FUNCTION(ctype_upper) +static PHP_FUNCTION(ctype_upper) { CTYPE(isupper); } @@ -276,7 +276,7 @@ /* {{{ proto bool ctype_xdigit(mixed c) Checks for character(s) representing a hexadecimal digit */ -PHP_FUNCTION(ctype_xdigit) +static PHP_FUNCTION(ctype_xdigit) { CTYPE(isxdigit); } http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/php_ctype.h?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/ctype/php_ctype.h diff -u php-src/ext/ctype/php_ctype.h:1.13 php-src/ext/ctype/php_ctype.h:1.14 --- php-src/ext/ctype/php_ctype.h:1.13 Sun Jan 1 13:09:48 2006 +++ php-src/ext/ctype/php_ctype.h Mon Aug 14 14:54:19 2006 @@ -33,23 +33,23 @@ #define PHP_CTYPE_API #endif -PHP_MINIT_FUNCTION(ctype); -PHP_MSHUTDOWN_FUNCTION(ctype); -PHP_RINIT_FUNCTION(ctype); -PHP_RSHUTDOWN_FUNCTION(ctype); -PHP_MINFO_FUNCTION(ctype); - -PHP_FUNCTION(ctype_alnum); -PHP_FUNCTION(ctype_alpha); -PHP_FUNCTION(ctype_cntrl); -PHP_FUNCTION(ctype_digit); -PHP_FUNCTION(ctype_lower); -PHP_FUNCTION(ctype_graph); -PHP_FUNCTION(ctype_print); -PHP_FUNCTION(ctype_punct); -PHP_FUNCTION(ctype_space); -PHP_FUNCTION(ctype_upper); -PHP_FUNCTION(ctype_xdigit); +static PHP_MINIT_FUNCTION(ctype); +static PHP_MSHUTDOWN_FUNCTION(ctype); +static PHP_RINIT_FUNCTION(ctype); +static PHP_RSHUTDOWN_FUNCTION(ctype); +static PHP_MINFO_FUNCTION(ctype); + +static PHP_FUNCTION(ctype_alnum); +static PHP_FUNCTION(ctype_alpha); +static PHP_FUNCTION(ctype_cntrl); +static PHP_FUNCTION(ctype_digit); +static PHP_FUNCTION(ctype_lower); +static PHP_FUNCTION(ctype_graph); +static PHP_FUNCTION(ctype_print); +static PHP_FUNCTION(ctype_punct); +static PHP_FUNCTION(ctype_space); +static PHP_FUNCTION(ctype_upper); +static PHP_FUNCTION(ctype_xdigit); /* Declare any global variables you may need between the BEGIN http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/php_pspell.h?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/pspell/php_pspell.h diff -u php-src/ext/pspell/php_pspell.h:1.16 php-src/ext/pspell/php_pspell.h:1.17 --- php-src/ext/pspell/php_pspell.h:1.16 Sun Jan 1 13:09:53 2006 +++ php-src/ext/pspell/php_pspell.h Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pspell.h,v 1.16 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: php_pspell.h,v 1.17 2006/08/14 14:54:19 nlopess Exp $ */ #ifndef _PSPELL_H #define _PSPELL_H @@ -24,27 +24,27 @@ extern zend_module_entry pspell_module_entry; #define pspell_module_ptr &pspell_module_entry -PHP_MINIT_FUNCTION(pspell); -PHP_MINFO_FUNCTION(pspell); -PHP_FUNCTION(pspell_new); -PHP_FUNCTION(pspell_new_personal); -PHP_FUNCTION(pspell_new_config); -PHP_FUNCTION(pspell_check); -PHP_FUNCTION(pspell_suggest); -PHP_FUNCTION(pspell_store_replacement); -PHP_FUNCTION(pspell_add_to_personal); -PHP_FUNCTION(pspell_add_to_session); -PHP_FUNCTION(pspell_clear_session); -PHP_FUNCTION(pspell_save_wordlist); -PHP_FUNCTION(pspell_config_create); -PHP_FUNCTION(pspell_config_runtogether); -PHP_FUNCTION(pspell_config_mode); -PHP_FUNCTION(pspell_config_ignore); -PHP_FUNCTION(pspell_config_personal); -PHP_FUNCTION(pspell_config_dict_dir); -PHP_FUNCTION(pspell_config_data_dir); -PHP_FUNCTION(pspell_config_repl); -PHP_FUNCTION(pspell_config_save_repl); +static PHP_MINIT_FUNCTION(pspell); +static PHP_MINFO_FUNCTION(pspell); +static PHP_FUNCTION(pspell_new); +static PHP_FUNCTION(pspell_new_personal); +static PHP_FUNCTION(pspell_new_config); +static PHP_FUNCTION(pspell_check); +static PHP_FUNCTION(pspell_suggest); +static PHP_FUNCTION(pspell_store_replacement); +static PHP_FUNCTION(pspell_add_to_personal); +static PHP_FUNCTION(pspell_add_to_session); +static PHP_FUNCTION(pspell_clear_session); +static PHP_FUNCTION(pspell_save_wordlist); +static PHP_FUNCTION(pspell_config_create); +static PHP_FUNCTION(pspell_config_runtogether); +static PHP_FUNCTION(pspell_config_mode); +static PHP_FUNCTION(pspell_config_ignore); +static PHP_FUNCTION(pspell_config_personal); +static PHP_FUNCTION(pspell_config_dict_dir); +static PHP_FUNCTION(pspell_config_data_dir); +static PHP_FUNCTION(pspell_config_repl); +static PHP_FUNCTION(pspell_config_save_repl); #else #define pspell_module_ptr NULL #endif http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.50&r2=1.51&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.50 php-src/ext/pspell/pspell.c:1.51 --- php-src/ext/pspell/pspell.c:1.50 Sun Feb 19 00:55:20 2006 +++ php-src/ext/pspell/pspell.c Mon Aug 14 14:54:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.50 2006/02/19 00:55:20 andi Exp $ */ +/* $Id: pspell.c,v 1.51 2006/08/14 14:54:19 nlopess Exp $ */ #define IS_EXT_MODULE @@ -119,7 +119,7 @@ /* {{{ PHP_MINIT_FUNCTION */ -PHP_MINIT_FUNCTION(pspell) +static PHP_MINIT_FUNCTION(pspell) { REGISTER_LONG_CONSTANT("PSPELL_FAST", PSPELL_FAST, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("PSPELL_NORMAL", PSPELL_NORMAL, CONST_PERSISTENT | CONST_CS); @@ -133,7 +133,7 @@ /* {{{ proto int pspell_new(string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) Load a dictionary */ -PHP_FUNCTION(pspell_new) +static PHP_FUNCTION(pspell_new) { zval **language,**spelling,**jargon,**encoding,**pmode; long mode = 0L, speed = 0L; @@ -236,7 +236,7 @@ /* {{{ proto int pspell_new_personal(string personal, string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) Load a dictionary with a personal wordlist*/ -PHP_FUNCTION(pspell_new_personal) +static PHP_FUNCTION(pspell_new_personal) { zval **personal, **language,**spelling,**jargon,**encoding,**pmode; long mode = 0L, speed = 0L; @@ -348,7 +348,7 @@ /* {{{ proto int pspell_new_config(int config) Load a dictionary based on the given config */ -PHP_FUNCTION(pspell_new_config) +static PHP_FUNCTION(pspell_new_config) { int type; zval **conf; @@ -381,7 +381,7 @@ /* {{{ proto bool pspell_check(int pspell, string word) Returns true if word is valid */ -PHP_FUNCTION(pspell_check) +static PHP_FUNCTION(pspell_check) { int type; zval **scin,**word; @@ -407,7 +407,7 @@ /* {{{ proto array pspell_suggest(int pspell, string word) Returns array of suggestions */ -PHP_FUNCTION(pspell_suggest) +static PHP_FUNCTION(pspell_suggest) { zval **scin, **word; int argc; @@ -442,7 +442,7 @@ /* {{{ proto bool pspell_store_replacement(int pspell, string misspell, string correct) Notify the dictionary of a user-selected replacement */ -PHP_FUNCTION(pspell_store_replacement) +static PHP_FUNCTION(pspell_store_replacement) { int type; zval **scin,**miss,**corr; @@ -470,7 +470,7 @@ /* {{{ proto bool pspell_add_to_personal(int pspell, string word) Adds a word to a personal list */ -PHP_FUNCTION(pspell_add_to_personal) +static PHP_FUNCTION(pspell_add_to_personal) { int type; zval **scin,**word; @@ -502,7 +502,7 @@ /* {{{ proto bool pspell_add_to_session(int pspell, string word) Adds a word to the current session */ -PHP_FUNCTION(pspell_add_to_session) +static PHP_FUNCTION(pspell_add_to_session) { int type; zval **scin,**word; @@ -534,7 +534,7 @@ /* {{{ proto bool pspell_clear_session(int pspell) Clears the current session */ -PHP_FUNCTION(pspell_clear_session) +static PHP_FUNCTION(pspell_clear_session) { int type; zval **scin; @@ -560,7 +560,7 @@ /* {{{ proto bool pspell_save_wordlist(int pspell) Saves the current (personal) wordlist */ -PHP_FUNCTION(pspell_save_wordlist) +static PHP_FUNCTION(pspell_save_wordlist) { int type; zval **scin; @@ -588,7 +588,7 @@ /* {{{ proto int pspell_config_create(string language [, string spelling [, string jargon [, string encoding]]]) Create a new config to be used later to create a manager */ -PHP_FUNCTION(pspell_config_create) +static PHP_FUNCTION(pspell_config_create) { zval **language,**spelling,**jargon,**encoding; int argc; @@ -663,7 +663,7 @@ /* {{{ proto bool pspell_config_runtogether(int conf, bool runtogether) Consider run-together words as valid components */ -PHP_FUNCTION(pspell_config_runtogether) +static PHP_FUNCTION(pspell_config_runtogether) { int type; zval **conf, **runtogether; @@ -687,7 +687,7 @@ /* {{{ proto bool pspell_config_mode(int conf, long mode) Select mode for config (PSPELL_FAST, PSPELL_NORMAL or PSPELL_BAD_SPELLERS) */ -PHP_FUNCTION(pspell_config_mode) +static PHP_FUNCTION(pspell_config_mode) { int type; zval **conf, **mode; @@ -719,7 +719,7 @@ /* {{{ proto bool pspell_config_ignore(int conf, int ignore) Ignore words <= n chars */ -PHP_FUNCTION(pspell_config_ignore) +static PHP_FUNCTION(pspell_config_ignore) { int type; zval **conf, **pignore; @@ -789,7 +789,7 @@ /* {{{ proto bool pspell_config_personal(int conf, string personal) Use a personal dictionary for this config */ -PHP_FUNCTION(pspell_config_personal) +static PHP_FUNCTION(pspell_config_personal) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "personal"); } @@ -797,7 +797,7 @@ /* {{{ proto bool pspell_config_dict_dir(int conf, string directory) location of the main word list */ -PHP_FUNCTION(pspell_config_dict_dir) +static PHP_FUNCTION(pspell_config_dict_dir) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "dict-dir"); } @@ -805,7 +805,7 @@ /* {{{ proto bool pspell_config_data_dir(int conf, string directory) location of language data files */ -PHP_FUNCTION(pspell_config_data_dir) +static PHP_FUNCTION(pspell_config_data_dir) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "data-dir"); } @@ -813,7 +813,7 @@ /* {{{ proto bool pspell_config_repl(int conf, string repl) Use a personal dictionary with replacement pairs for this config */ -PHP_FUNCTION(pspell_config_repl) +static PHP_FUNCTION(pspell_config_repl) { int type; zval **conf, **repl; @@ -844,7 +844,7 @@ /* {{{ proto bool pspell_config_save_repl(int conf, bool save) Save replacement pairs when personal list is saved for this config */ -PHP_FUNCTION(pspell_config_save_repl) +static PHP_FUNCTION(pspell_config_save_repl) { int type; zval **conf, **save; @@ -868,7 +868,7 @@ /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(pspell) +static PHP_MINFO_FUNCTION(pspell) { php_info_print_table_start(); php_info_print_table_row(2, "PSpell Support", "enabled");