diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:12:55 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:12:55 +0200 |
commit | 7f6387b59ae1b5d642b0d05afbb14cab07061a9a (patch) | |
tree | d09f6f4674163b6a57d8805408877b05294f6931 /ext/opcache | |
parent | 3f72c77ce47ee0906905b83161d9c1d24e425d89 (diff) | |
download | php-git-7f6387b59ae1b5d642b0d05afbb14cab07061a9a.tar.gz |
Trim trailing whitespace in source code files
Diffstat (limited to 'ext/opcache')
-rw-r--r-- | ext/opcache/Optimizer/compact_literals.c | 2 | ||||
-rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 12 | ||||
-rw-r--r-- | ext/opcache/ZendAccelerator.c | 2 | ||||
-rw-r--r-- | ext/opcache/config.m4 | 10 | ||||
-rw-r--r-- | ext/opcache/config.w32 | 3 |
5 files changed, 14 insertions, 15 deletions
diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index 3a3cbe6564..e5dd8540aa 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -349,7 +349,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx } switch (Z_TYPE(op_array->literals[i])) { case IS_NULL: - /* Only checking MAY_MERGE for IS_NULL here + /* Only checking MAY_MERGE for IS_NULL here * is because only IS_NULL can be default value for class type hinting(RECV_INIT). */ if ((info[i].flags & LITERAL_MAY_MERGE)) { if (l_null < 0) { diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 92813ec30f..89bd75c1ed 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2190,15 +2190,15 @@ static int zend_update_type_info(const zend_op_array *op_array, tmp = 0; if (ssa_ops[i].result_def >= 0) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def); - } - if (ssa_ops[i].op1_def >= 0) { + } + if (ssa_ops[i].op1_def >= 0) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); - } - if (ssa_ops[i].op2_def >= 0) { + } + if (ssa_ops[i].op2_def >= 0) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def); - } + } return 1; - } + } switch (opline->opcode) { case ZEND_ADD: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 4e0a26166e..8a3f901847 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2023,7 +2023,7 @@ static zend_string* persistent_zend_resolve_path(const char *filename, int filen zend_string *resolved_path; int key_length; char *key = NULL; - + if (!ZCG(accel_directives).revalidate_path) { /* lookup by "not-real" path */ key = accel_make_persistent_key(filename, filename_len, &key_length); diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index ded7f3dab2..92e2ce97ef 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -348,12 +348,12 @@ AC_MSG_CHECKING("whether flock struct is linux ordered") AC_TRY_RUN([ #include <fcntl.h> struct flock lock = { 1, 2, 3, 4, 5 }; - int main() { + int main() { if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { return 0; } return 1; - } + } ], [ flock_type=linux AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) @@ -364,15 +364,15 @@ AC_MSG_CHECKING("whether flock struct is BSD ordered") AC_TRY_RUN([ #include <fcntl.h> struct flock lock = { 1, 2, 3, 4, 5 }; - int main() { + int main() { if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { return 0; } return 1; - } + } ], [ flock_type=bsd - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) + AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) AC_MSG_RESULT("yes") ], AC_MSG_RESULT("no") ) diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32 index 35c4645620..61b4d866c0 100644 --- a/ext/opcache/config.w32 +++ b/ext/opcache/config.w32 @@ -25,8 +25,7 @@ if (PHP_OPCACHE != "no") { ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c pass1_5.c pass2.c pass3.c optimize_func_calls.c block_pass.c optimize_temp_vars_5.c nop_removal.c compact_literals.c zend_cfg.c zend_dfg.c dfa_pass.c zend_ssa.c zend_inference.c zend_func_info.c zend_call_graph.c zend_dump.c", "opcache", "OptimizerObj"); - + ADD_FLAG('CFLAGS_OPCACHE', "/I " + configure_module_dirname); } -
\ No newline at end of file |