Skip to content

Commit 623911f

Browse files
petkpetk
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Remove local variables
2 parents 5ded0e8 + 92ac598 commit 623911f

File tree

888 files changed

+111
-7004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

888 files changed

+111
-7004
lines changed

Diff for: ‎README.STREAMS

-2
Original file line numberDiff line numberDiff line change
@@ -374,5 +374,3 @@ the example above, you need to use mysql_free_result on the rowset, close the
374374
connection and then use pefree to dispose of the struct you allocated.
375375
You may read the stream->persistent field to determine if your struct was
376376
allocated in persistent mode or not.
377-
378-
vim:tw=78:et

Diff for: ‎README.WIN32-BUILD-SYSTEM

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
The Win32 Build System.
22

33
See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
4-
5-
vim:tw=78:sw=1:ts=1:et

Diff for: ‎TSRM/TSRM.c

-9
Original file line numberDiff line numberDiff line change
@@ -794,12 +794,3 @@ TSRM_API const char *tsrm_api_name(void)
794794
}/*}}}*/
795795

796796
#endif /* ZTS */
797-
798-
/*
799-
* Local variables:
800-
* tab-width: 4
801-
* c-basic-offset: 4
802-
* End:
803-
* vim600: sw=4 ts=4 fdm=marker
804-
* vim<600: sw=4 ts=4
805-
*/

Diff for: ‎TSRM/TSRM.h

-9
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,3 @@ TSRM_API const char *tsrm_api_name(void);
210210
#endif /* ZTS */
211211

212212
#endif /* TSRM_H */
213-
214-
/*
215-
* Local variables:
216-
* tab-width: 4
217-
* c-basic-offset: 4
218-
* End:
219-
* vim600: sw=4 ts=4 fdm=marker
220-
* vim<600: sw=4 ts=4
221-
*/

Diff for: ‎TSRM/tsrm_config.w32.h

-9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,3 @@
1212
#include <crtdbg.h>
1313

1414
#endif
15-
16-
/*
17-
* Local variables:
18-
* tab-width: 4
19-
* c-basic-offset: 4
20-
* End:
21-
* vim600: sw=4 ts=4 fdm=marker
22-
* vim<600: sw=4 ts=4
23-
*/

Diff for: ‎TSRM/tsrm_config_common.h

-9
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,3 @@ char *alloca ();
6969
#endif
7070

7171
#endif /* TSRM_CONFIG_COMMON_H */
72-
73-
/*
74-
* Local variables:
75-
* tab-width: 4
76-
* c-basic-offset: 4
77-
* End:
78-
* vim600: sw=4 ts=4 fdm=marker
79-
* vim<600: sw=4 ts=4
80-
*/

Diff for: ‎TSRM/tsrm_strtok_r.c

-9
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,3 @@ main()
6161
}
6262

6363
#endif
64-
65-
/*
66-
* Local variables:
67-
* tab-width: 4
68-
* c-basic-offset: 4
69-
* End:
70-
* vim600: sw=4 ts=4 fdm=marker
71-
* vim<600: sw=4 ts=4
72-
*/

Diff for: ‎TSRM/tsrm_win32.c

-9
Original file line numberDiff line numberDiff line change
@@ -820,12 +820,3 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
820820
/* }}} */
821821
#endif
822822
#endif
823-
824-
/*
825-
* Local variables:
826-
* tab-width: 4
827-
* c-basic-offset: 4
828-
* End:
829-
* vim600: sw=4 ts=4 fdm=marker
830-
* vim<600: sw=4 ts=4
831-
*/

Diff for: ‎TSRM/tsrm_win32.h

-9
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,3 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags);
109109
TSRM_API int shmdt(const void *shmaddr);
110110
TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);
111111
#endif
112-
113-
/*
114-
* Local variables:
115-
* tab-width: 4
116-
* c-basic-offset: 4
117-
* End:
118-
* vim600: sw=4 ts=4 fdm=marker
119-
* vim<600: sw=4 ts=4
120-
*/

Diff for: ‎Zend/zend.c

-10
Original file line numberDiff line numberDiff line change
@@ -1740,13 +1740,3 @@ ZEND_API void zend_map_ptr_extend(size_t last)
17401740
CG(map_ptr_last) = last;
17411741
}
17421742
}
1743-
1744-
/*
1745-
* Local variables:
1746-
* tab-width: 4
1747-
* c-basic-offset: 4
1748-
* indent-tabs-mode: t
1749-
* End:
1750-
* vim600: sw=4 ts=4 fdm=marker
1751-
* vim<600: sw=4 ts=4
1752-
*/

Diff for: ‎Zend/zend.h

-10
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,3 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved);
354354
#include "zend_operators.h"
355355

356356
#endif /* ZEND_H */
357-
358-
/*
359-
* Local variables:
360-
* tab-width: 4
361-
* c-basic-offset: 4
362-
* indent-tabs-mode: t
363-
* End:
364-
* vim600: sw=4 ts=4 fdm=marker
365-
* vim<600: sw=4 ts=4
366-
*/

Diff for: ‎Zend/zend_API.c

-10
Original file line numberDiff line numberDiff line change
@@ -4348,13 +4348,3 @@ ZEND_API zend_bool zend_is_countable(zval *countable) /* {{{ */
43484348
}
43494349
}
43504350
/* }}} */
4351-
4352-
/*
4353-
* Local variables:
4354-
* tab-width: 4
4355-
* c-basic-offset: 4
4356-
* indent-tabs-mode: t
4357-
* End:
4358-
* vim600: sw=4 ts=4 fdm=marker
4359-
* vim<600: sw=4 ts=4
4360-
*/

Diff for: ‎Zend/zend_API.h

-11
Original file line numberDiff line numberDiff line change
@@ -1571,14 +1571,3 @@ static zend_always_inline void zend_parse_arg_zval_deref(zval *arg, zval **dest,
15711571
END_EXTERN_C()
15721572

15731573
#endif /* ZEND_API_H */
1574-
1575-
1576-
/*
1577-
* Local variables:
1578-
* tab-width: 4
1579-
* c-basic-offset: 4
1580-
* indent-tabs-mode: t
1581-
* End:
1582-
* vim600: sw=4 ts=4 fdm=marker
1583-
* vim<600: sw=4 ts=4
1584-
*/

Diff for: ‎Zend/zend_alloc.c

-10
Original file line numberDiff line numberDiff line change
@@ -2948,13 +2948,3 @@ ZEND_API void * __zend_realloc(void *p, size_t len)
29482948
}
29492949
zend_out_of_memory();
29502950
}
2951-
2952-
/*
2953-
* Local variables:
2954-
* tab-width: 4
2955-
* c-basic-offset: 4
2956-
* indent-tabs-mode: t
2957-
* End:
2958-
* vim600: sw=4 ts=4 fdm=marker
2959-
* vim<600: sw=4 ts=4
2960-
*/

Diff for: ‎Zend/zend_alloc.h

-10
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,3 @@ static void apc_init_heap(void)
401401
END_EXTERN_C()
402402

403403
#endif
404-
405-
/*
406-
* Local variables:
407-
* tab-width: 4
408-
* c-basic-offset: 4
409-
* indent-tabs-mode: t
410-
* End:
411-
* vim600: sw=4 ts=4 fdm=marker
412-
* vim<600: sw=4 ts=4
413-
*/

Diff for: ‎Zend/zend_alloc_sizes.h

-10
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,3 @@
6262
_(29, 3072, 4, 3, x, y)
6363

6464
#endif /* ZEND_ALLOC_SIZES_H */
65-
66-
/*
67-
* Local variables:
68-
* tab-width: 4
69-
* c-basic-offset: 4
70-
* indent-tabs-mode: t
71-
* End:
72-
* vim600: sw=4 ts=4 fdm=marker
73-
* vim<600: sw=4 ts=4
74-
*/

Diff for: ‎Zend/zend_arena.h

-10
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,3 @@ static zend_always_inline void zend_arena_release(zend_arena **arena_ptr, void *
111111
}
112112

113113
#endif /* _ZEND_ARENA_H_ */
114-
115-
/*
116-
* Local variables:
117-
* tab-width: 4
118-
* c-basic-offset: 4
119-
* indent-tabs-mode: t
120-
* End:
121-
* vim600: sw=4 ts=4 fdm=marker
122-
* vim<600: sw=4 ts=4
123-
*/

Diff for: ‎Zend/zend_ast.c

-10
Original file line numberDiff line numberDiff line change
@@ -2044,13 +2044,3 @@ ZEND_API ZEND_COLD zend_string *zend_ast_export(const char *prefix, zend_ast *as
20442044
smart_str_0(&str);
20452045
return str.s;
20462046
}
2047-
2048-
/*
2049-
* Local variables:
2050-
* tab-width: 4
2051-
* c-basic-offset: 4
2052-
* indent-tabs-mode: t
2053-
* End:
2054-
* vim600: sw=4 ts=4 fdm=marker
2055-
* vim<600: sw=4 ts=4
2056-
*/

Diff for: ‎Zend/zend_ast.h

-10
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,3 @@ static zend_always_inline zend_ast *zend_ast_list_rtrim(zend_ast *ast) {
335335
return ast;
336336
}
337337
#endif
338-
339-
/*
340-
* Local variables:
341-
* tab-width: 4
342-
* c-basic-offset: 4
343-
* indent-tabs-mode: t
344-
* End:
345-
* vim600: sw=4 ts=4 fdm=marker
346-
* vim<600: sw=4 ts=4
347-
*/

Diff for: ‎Zend/zend_bitset.h

-10
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,3 @@ static inline int zend_bitset_pop_first(zend_bitset set, uint32_t len) {
252252
}
253253

254254
#endif /* _ZEND_BITSET_H_ */
255-
256-
/*
257-
* Local variables:
258-
* tab-width: 4
259-
* c-basic-offset: 4
260-
* indent-tabs-mode: t
261-
* End:
262-
* vim600: sw=4 ts=4 fdm=marker
263-
* vim<600: sw=4 ts=4
264-
*/

Diff for: ‎Zend/zend_build.h

-10
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,3 @@
4444
#define ZEND_BUILD_EXTRA
4545

4646
#endif
47-
48-
/*
49-
* Local variables:
50-
* tab-width: 4
51-
* c-basic-offset: 4
52-
* indent-tabs-mode: t
53-
* End:
54-
* vim600: sw=4 ts=4 fdm=marker
55-
* vim<600: sw=4 ts=4
56-
*/

Diff for: ‎Zend/zend_builtin_functions.c

-10
Original file line numberDiff line numberDiff line change
@@ -2582,13 +2582,3 @@ ZEND_FUNCTION(get_extension_funcs)
25822582
}
25832583
}
25842584
/* }}} */
2585-
2586-
/*
2587-
* Local variables:
2588-
* tab-width: 4
2589-
* c-basic-offset: 4
2590-
* indent-tabs-mode: t
2591-
* End:
2592-
* vim600: sw=4 ts=4 fdm=marker
2593-
* vim<600: sw=4 ts=4
2594-
*/

Diff for: ‎Zend/zend_builtin_functions.h

-10
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,3 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
2727
END_EXTERN_C()
2828

2929
#endif /* ZEND_BUILTIN_FUNCTIONS_H */
30-
31-
/*
32-
* Local variables:
33-
* tab-width: 4
34-
* c-basic-offset: 4
35-
* indent-tabs-mode: t
36-
* End:
37-
* vim600: sw=4 ts=4 fdm=marker
38-
* vim<600: sw=4 ts=4
39-
*/

Diff for: ‎Zend/zend_closures.c

-10
Original file line numberDiff line numberDiff line change
@@ -759,13 +759,3 @@ void zend_closure_bind_var_ex(zval *closure_zv, uint32_t offset, zval *val) /* {
759759
ZVAL_COPY_VALUE(var, val);
760760
}
761761
/* }}} */
762-
763-
/*
764-
* Local variables:
765-
* tab-width: 4
766-
* c-basic-offset: 4
767-
* indent-tabs-mode: t
768-
* End:
769-
* vim600: sw=4 ts=4 fdm=marker
770-
* vim<600: sw=4 ts=4
771-
*/

Diff for: ‎Zend/zend_closures.h

-10
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,3 @@ ZEND_API zval* zend_get_closure_this_ptr(zval *obj);
4141
END_EXTERN_C()
4242

4343
#endif
44-
45-
/*
46-
* Local variables:
47-
* tab-width: 4
48-
* c-basic-offset: 4
49-
* indent-tabs-mode: t
50-
* End:
51-
* vim600: sw=4 ts=4 fdm=marker
52-
* vim<600: sw=4 ts=4
53-
*/

Diff for: ‎Zend/zend_compile.c

-10
Original file line numberDiff line numberDiff line change
@@ -8643,13 +8643,3 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
86438643
*ast_ptr = zend_ast_create_zval(&result);
86448644
}
86458645
/* }}} */
8646-
8647-
/*
8648-
* Local variables:
8649-
* tab-width: 4
8650-
* c-basic-offset: 4
8651-
* indent-tabs-mode: t
8652-
* End:
8653-
* vim600: sw=4 ts=4 fdm=marker
8654-
* vim<600: sw=4 ts=4
8655-
*/

Diff for: ‎Zend/zend_compile.h

-10
Original file line numberDiff line numberDiff line change
@@ -1065,13 +1065,3 @@ END_EXTERN_C()
10651065
ZEND_API zend_bool zend_binary_op_produces_numeric_string_error(uint32_t opcode, zval *op1, zval *op2);
10661066

10671067
#endif /* ZEND_COMPILE_H */
1068-
1069-
/*
1070-
* Local variables:
1071-
* tab-width: 4
1072-
* c-basic-offset: 4
1073-
* indent-tabs-mode: t
1074-
* End:
1075-
* vim600: sw=4 ts=4 fdm=marker
1076-
* vim<600: sw=4 ts=4
1077-
*/

Diff for: ‎Zend/zend_config.w32.h

-10
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,3 @@ extern "C++" {
8585
#define ZEND_DLIMPORT __declspec(dllimport)
8686

8787
#endif /* ZEND_CONFIG_W32_H */
88-
89-
/*
90-
* Local variables:
91-
* tab-width: 4
92-
* c-basic-offset: 4
93-
* indent-tabs-mode: t
94-
* End:
95-
* vim600: sw=4 ts=4 fdm=marker
96-
* vim<600: sw=4 ts=4
97-
*/

Diff for: ‎Zend/zend_constants.c

-11
Original file line numberDiff line numberDiff line change
@@ -490,14 +490,3 @@ ZEND_API int zend_register_constant(zend_constant *c)
490490
}
491491
return ret;
492492
}
493-
494-
495-
/*
496-
* Local variables:
497-
* tab-width: 4
498-
* c-basic-offset: 4
499-
* indent-tabs-mode: t
500-
* End:
501-
* vim600: sw=4 ts=4 fdm=marker
502-
* vim<600: sw=4 ts=4
503-
*/

Diff for: ‎Zend/zend_constants.h

-10
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,3 @@ END_EXTERN_C()
100100
#define ZEND_CONSTANT_DTOR free_zend_constant
101101

102102
#endif
103-
104-
/*
105-
* Local variables:
106-
* tab-width: 4
107-
* c-basic-offset: 4
108-
* indent-tabs-mode: t
109-
* End:
110-
* vim600: sw=4 ts=4 fdm=marker
111-
* vim<600: sw=4 ts=4
112-
*/

0 commit comments

Comments
 (0)