Skip to content

Commit 615a15d

Browse files
nunoplopesnunoplopes
committed
a few more static keywording
1 parent c62d5fd commit 615a15d

File tree

6 files changed

+94
-94
lines changed

6 files changed

+94
-94
lines changed

‎ext/bz2/bz2.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ZEND_END_ARG_INFO()
8383

8484
/* }}} */
8585

86-
zend_function_entry bz2_functions[] = {
86+
static zend_function_entry bz2_functions[] = {
8787
PHP_FE(bzopen, arginfo_bzopen)
8888
PHP_FE(bzread, arginfo_bzread)
8989
PHP_FALIAS(bzwrite, fwrite, NULL)
@@ -167,7 +167,7 @@ static int php_bz2iop_flush(php_stream *stream TSRMLS_DC)
167167
}
168168
/* }}} */
169169

170-
php_stream_ops php_stream_bz2io_ops = {
170+
static php_stream_ops php_stream_bz2io_ops = {
171171
php_bz2iop_write, php_bz2iop_read,
172172
php_bz2iop_close, php_bz2iop_flush,
173173
"BZip2",
@@ -272,30 +272,30 @@ static php_stream_wrapper_ops bzip2_stream_wops = {
272272
NULL /* rmdir */
273273
};
274274

275-
php_stream_wrapper php_stream_bzip2_wrapper = {
275+
static php_stream_wrapper php_stream_bzip2_wrapper = {
276276
&bzip2_stream_wops,
277277
NULL,
278278
0 /* is_url */
279279
};
280280

281281
static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int);
282282

283-
PHP_MINIT_FUNCTION(bz2)
283+
static PHP_MINIT_FUNCTION(bz2)
284284
{
285285
php_register_url_stream_wrapper("compress.bzip2", &php_stream_bzip2_wrapper TSRMLS_CC);
286286
php_stream_filter_register_factory("bzip2.*", &php_bz2_filter_factory TSRMLS_CC);
287287
return SUCCESS;
288288
}
289289

290-
PHP_MSHUTDOWN_FUNCTION(bz2)
290+
static PHP_MSHUTDOWN_FUNCTION(bz2)
291291
{
292292
php_unregister_url_stream_wrapper("compress.bzip2" TSRMLS_CC);
293293
php_stream_filter_unregister_factory("bzip2.*" TSRMLS_CC);
294294

295295
return SUCCESS;
296296
}
297297

298-
PHP_MINFO_FUNCTION(bz2)
298+
static PHP_MINFO_FUNCTION(bz2)
299299
{
300300
php_info_print_table_start();
301301
php_info_print_table_row(2, "BZip2 Support", "Enabled");
@@ -307,7 +307,7 @@ PHP_MINFO_FUNCTION(bz2)
307307

308308
/* {{{ proto string bzread(resource bz[, int length])
309309
Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */
310-
PHP_FUNCTION(bzread)
310+
static PHP_FUNCTION(bzread)
311311
{
312312
zval *bz;
313313
long len = 1024;
@@ -347,7 +347,7 @@ PHP_FUNCTION(bzread)
347347

348348
/* {{{ proto resource bzopen(string|int file|fp, string mode)
349349
Opens a new BZip2 stream */
350-
PHP_FUNCTION(bzopen)
350+
static PHP_FUNCTION(bzopen)
351351
{
352352
zval **file, /* The file to open */
353353
**mode; /* The mode to open the stream with */
@@ -435,31 +435,31 @@ PHP_FUNCTION(bzopen)
435435

436436
/* {{{ proto int bzerrno(resource bz)
437437
Returns the error number */
438-
PHP_FUNCTION(bzerrno)
438+
static PHP_FUNCTION(bzerrno)
439439
{
440440
php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO);
441441
}
442442
/* }}} */
443443

444444
/* {{{ proto string bzerrstr(resource bz)
445445
Returns the error string */
446-
PHP_FUNCTION(bzerrstr)
446+
static PHP_FUNCTION(bzerrstr)
447447
{
448448
php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR);
449449
}
450450
/* }}} */
451451

452452
/* {{{ proto array bzerror(resource bz)
453453
Returns the error number and error string in an associative array */
454-
PHP_FUNCTION(bzerror)
454+
static PHP_FUNCTION(bzerror)
455455
{
456456
php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH);
457457
}
458458
/* }}} */
459459

460460
/* {{{ proto string bzcompress(string source [, int blocksize100k [, int workfactor]])
461461
Compresses a string into BZip2 encoded data */
462-
PHP_FUNCTION(bzcompress)
462+
static PHP_FUNCTION(bzcompress)
463463
{
464464
zval **source, /* Source data to compress */
465465
**zblock_size, /* Optional block size to use */
@@ -517,7 +517,7 @@ PHP_FUNCTION(bzcompress)
517517

518518
/* {{{ proto string bzdecompress(string source [, int small])
519519
Decompresses BZip2 compressed data */
520-
PHP_FUNCTION(bzdecompress)
520+
static PHP_FUNCTION(bzdecompress)
521521
{
522522
char *source, *dest;
523523
int source_len, error;

‎ext/bz2/php_bz2.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ extern zend_module_entry bz2_module_entry;
2929
/* Bzip2 includes */
3030
#include <bzlib.h>
3131

32-
PHP_MINIT_FUNCTION(bz2);
33-
PHP_MSHUTDOWN_FUNCTION(bz2);
34-
PHP_MINFO_FUNCTION(bz2);
35-
PHP_FUNCTION(bzopen);
36-
PHP_FUNCTION(bzread);
37-
PHP_FUNCTION(bzerrno);
38-
PHP_FUNCTION(bzerrstr);
39-
PHP_FUNCTION(bzerror);
40-
PHP_FUNCTION(bzcompress);
41-
PHP_FUNCTION(bzdecompress);
32+
static PHP_MINIT_FUNCTION(bz2);
33+
static PHP_MSHUTDOWN_FUNCTION(bz2);
34+
static PHP_MINFO_FUNCTION(bz2);
35+
static PHP_FUNCTION(bzopen);
36+
static PHP_FUNCTION(bzread);
37+
static PHP_FUNCTION(bzerrno);
38+
static PHP_FUNCTION(bzerrstr);
39+
static PHP_FUNCTION(bzerror);
40+
static PHP_FUNCTION(bzcompress);
41+
static PHP_FUNCTION(bzdecompress);
4242

4343
#else
4444
#define phpext_bz2_ptr NULL

‎ext/ctype/ctype.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ZEND_END_ARG_INFO()
101101
/* {{{ ctype_functions[]
102102
* Every user visible function must have an entry in ctype_functions[].
103103
*/
104-
zend_function_entry ctype_functions[] = {
104+
static zend_function_entry ctype_functions[] = {
105105
PHP_FE(ctype_alnum, arginfo_ctype_alnum)
106106
PHP_FE(ctype_alpha, arginfo_ctype_alpha)
107107
PHP_FE(ctype_cntrl, arginfo_ctype_cntrl)
@@ -139,7 +139,7 @@ ZEND_GET_MODULE(ctype)
139139

140140
/* {{{ PHP_MINFO_FUNCTION
141141
*/
142-
PHP_MINFO_FUNCTION(ctype)
142+
static PHP_MINFO_FUNCTION(ctype)
143143
{
144144
php_info_print_table_start();
145145
php_info_print_table_row(2, "ctype functions", "enabled");
@@ -187,87 +187,87 @@ PHP_MINFO_FUNCTION(ctype)
187187

188188
/* {{{ proto bool ctype_alnum(mixed c)
189189
Checks for alphanumeric character(s) */
190-
PHP_FUNCTION(ctype_alnum)
190+
static PHP_FUNCTION(ctype_alnum)
191191
{
192192
CTYPE(isalnum);
193193
}
194194
/* }}} */
195195

196196
/* {{{ proto bool ctype_alpha(mixed c)
197197
Checks for alphabetic character(s) */
198-
PHP_FUNCTION(ctype_alpha)
198+
static PHP_FUNCTION(ctype_alpha)
199199
{
200200
CTYPE(isalpha);
201201
}
202202
/* }}} */
203203

204204
/* {{{ proto bool ctype_cntrl(mixed c)
205205
Checks for control character(s) */
206-
PHP_FUNCTION(ctype_cntrl)
206+
static PHP_FUNCTION(ctype_cntrl)
207207
{
208208
CTYPE(iscntrl);
209209
}
210210
/* }}} */
211211

212212
/* {{{ proto bool ctype_digit(mixed c)
213213
Checks for numeric character(s) */
214-
PHP_FUNCTION(ctype_digit)
214+
static PHP_FUNCTION(ctype_digit)
215215
{
216216
CTYPE(isdigit);
217217
}
218218
/* }}} */
219219

220220
/* {{{ proto bool ctype_lower(mixed c)
221221
Checks for lowercase character(s) */
222-
PHP_FUNCTION(ctype_lower)
222+
static PHP_FUNCTION(ctype_lower)
223223
{
224224
CTYPE(islower);
225225
}
226226
/* }}} */
227227

228228
/* {{{ proto bool ctype_graph(mixed c)
229229
Checks for any printable character(s) except space */
230-
PHP_FUNCTION(ctype_graph)
230+
static PHP_FUNCTION(ctype_graph)
231231
{
232232
CTYPE(isgraph);
233233
}
234234
/* }}} */
235235

236236
/* {{{ proto bool ctype_print(mixed c)
237237
Checks for printable character(s) */
238-
PHP_FUNCTION(ctype_print)
238+
static PHP_FUNCTION(ctype_print)
239239
{
240240
CTYPE(isprint);
241241
}
242242
/* }}} */
243243

244244
/* {{{ proto bool ctype_punct(mixed c)
245245
Checks for any printable character which is not whitespace or an alphanumeric character */
246-
PHP_FUNCTION(ctype_punct)
246+
static PHP_FUNCTION(ctype_punct)
247247
{
248248
CTYPE(ispunct);
249249
}
250250
/* }}} */
251251

252252
/* {{{ proto bool ctype_space(mixed c)
253253
Checks for whitespace character(s)*/
254-
PHP_FUNCTION(ctype_space)
254+
static PHP_FUNCTION(ctype_space)
255255
{
256256
CTYPE(isspace);
257257
}
258258
/* }}} */
259259

260260
/* {{{ proto bool ctype_upper(mixed c)
261261
Checks for uppercase character(s) */
262-
PHP_FUNCTION(ctype_upper)
262+
static PHP_FUNCTION(ctype_upper)
263263
{
264264
CTYPE(isupper);
265265
}
266266
/* }}} */
267267

268268
/* {{{ proto bool ctype_xdigit(mixed c)
269269
Checks for character(s) representing a hexadecimal digit */
270-
PHP_FUNCTION(ctype_xdigit)
270+
static PHP_FUNCTION(ctype_xdigit)
271271
{
272272
CTYPE(isxdigit);
273273
}

‎ext/ctype/php_ctype.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ extern zend_module_entry ctype_module_entry;
3333
#define PHP_CTYPE_API
3434
#endif
3535

36-
PHP_MINIT_FUNCTION(ctype);
37-
PHP_MSHUTDOWN_FUNCTION(ctype);
38-
PHP_RINIT_FUNCTION(ctype);
39-
PHP_RSHUTDOWN_FUNCTION(ctype);
40-
PHP_MINFO_FUNCTION(ctype);
36+
static PHP_MINIT_FUNCTION(ctype);
37+
static PHP_MSHUTDOWN_FUNCTION(ctype);
38+
static PHP_RINIT_FUNCTION(ctype);
39+
static PHP_RSHUTDOWN_FUNCTION(ctype);
40+
static PHP_MINFO_FUNCTION(ctype);
4141

42-
PHP_FUNCTION(ctype_alnum);
43-
PHP_FUNCTION(ctype_alpha);
44-
PHP_FUNCTION(ctype_cntrl);
45-
PHP_FUNCTION(ctype_digit);
46-
PHP_FUNCTION(ctype_lower);
47-
PHP_FUNCTION(ctype_graph);
48-
PHP_FUNCTION(ctype_print);
49-
PHP_FUNCTION(ctype_punct);
50-
PHP_FUNCTION(ctype_space);
51-
PHP_FUNCTION(ctype_upper);
52-
PHP_FUNCTION(ctype_xdigit);
42+
static PHP_FUNCTION(ctype_alnum);
43+
static PHP_FUNCTION(ctype_alpha);
44+
static PHP_FUNCTION(ctype_cntrl);
45+
static PHP_FUNCTION(ctype_digit);
46+
static PHP_FUNCTION(ctype_lower);
47+
static PHP_FUNCTION(ctype_graph);
48+
static PHP_FUNCTION(ctype_print);
49+
static PHP_FUNCTION(ctype_punct);
50+
static PHP_FUNCTION(ctype_space);
51+
static PHP_FUNCTION(ctype_upper);
52+
static PHP_FUNCTION(ctype_xdigit);
5353

5454
/*
5555
Declare any global variables you may need between the BEGIN

‎ext/pspell/php_pspell.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
extern zend_module_entry pspell_module_entry;
2525
#define pspell_module_ptr &pspell_module_entry
2626

27-
PHP_MINIT_FUNCTION(pspell);
28-
PHP_MINFO_FUNCTION(pspell);
29-
PHP_FUNCTION(pspell_new);
30-
PHP_FUNCTION(pspell_new_personal);
31-
PHP_FUNCTION(pspell_new_config);
32-
PHP_FUNCTION(pspell_check);
33-
PHP_FUNCTION(pspell_suggest);
34-
PHP_FUNCTION(pspell_store_replacement);
35-
PHP_FUNCTION(pspell_add_to_personal);
36-
PHP_FUNCTION(pspell_add_to_session);
37-
PHP_FUNCTION(pspell_clear_session);
38-
PHP_FUNCTION(pspell_save_wordlist);
39-
PHP_FUNCTION(pspell_config_create);
40-
PHP_FUNCTION(pspell_config_runtogether);
41-
PHP_FUNCTION(pspell_config_mode);
42-
PHP_FUNCTION(pspell_config_ignore);
43-
PHP_FUNCTION(pspell_config_personal);
44-
PHP_FUNCTION(pspell_config_dict_dir);
45-
PHP_FUNCTION(pspell_config_data_dir);
46-
PHP_FUNCTION(pspell_config_repl);
47-
PHP_FUNCTION(pspell_config_save_repl);
27+
static PHP_MINIT_FUNCTION(pspell);
28+
static PHP_MINFO_FUNCTION(pspell);
29+
static PHP_FUNCTION(pspell_new);
30+
static PHP_FUNCTION(pspell_new_personal);
31+
static PHP_FUNCTION(pspell_new_config);
32+
static PHP_FUNCTION(pspell_check);
33+
static PHP_FUNCTION(pspell_suggest);
34+
static PHP_FUNCTION(pspell_store_replacement);
35+
static PHP_FUNCTION(pspell_add_to_personal);
36+
static PHP_FUNCTION(pspell_add_to_session);
37+
static PHP_FUNCTION(pspell_clear_session);
38+
static PHP_FUNCTION(pspell_save_wordlist);
39+
static PHP_FUNCTION(pspell_config_create);
40+
static PHP_FUNCTION(pspell_config_runtogether);
41+
static PHP_FUNCTION(pspell_config_mode);
42+
static PHP_FUNCTION(pspell_config_ignore);
43+
static PHP_FUNCTION(pspell_config_personal);
44+
static PHP_FUNCTION(pspell_config_dict_dir);
45+
static PHP_FUNCTION(pspell_config_data_dir);
46+
static PHP_FUNCTION(pspell_config_repl);
47+
static PHP_FUNCTION(pspell_config_save_repl);
4848
#else
4949
#define pspell_module_ptr NULL
5050
#endif

0 commit comments

Comments
 (0)