Skip to content

Commit 7f6387b

Browse files
committed
Trim trailing whitespace in source code files
1 parent 3f72c77 commit 7f6387b

File tree

458 files changed

+4716
-4719
lines changed

Some content is hidden

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

458 files changed

+4716
-4719
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cache:
1414
- c:\build-cache
1515

1616
environment:
17-
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
17+
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
1818
PHP_BUILD_OBJ_DIR: c:\obj
1919
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
2020
PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1

.gdbinit

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ end
55
document set_ts
66
set the ts resource, it is impossible for gdb to
77
call ts_resource_ex while no process is running,
8-
but we could get the resource from the argument
8+
but we could get the resource from the argument
99
of frame info.
1010
end
1111

@@ -153,7 +153,7 @@ end
153153

154154
define printzv
155155
set $ind = 1
156-
____printzv $arg0 0
156+
____printzv $arg0 0
157157
end
158158

159159
document printzv
@@ -190,7 +190,7 @@ define ____printzv_contents
190190
if $type == 6
191191
printf "string: %s", $zvalue->value.str->val
192192
end
193-
if $type == 7
193+
if $type == 7
194194
printf "array: "
195195
if ! $arg1
196196
set $ind = $ind + 1
@@ -287,7 +287,7 @@ define ____printzv
287287
if $arg1
288288
____printzv_contents $zcontents $arg1
289289
else
290-
____printzv_contents $zcontents 0
290+
____printzv_contents $zcontents 0
291291
end
292292
end
293293

@@ -340,7 +340,7 @@ define ____print_ht
340340
set $n = $n - 1
341341
end
342342
printf "[%d] ", $i
343-
if $p->key
343+
if $p->key
344344
printf "%s => ", $p->key->val
345345
else
346346
printf "%d => ", $p->h
@@ -389,7 +389,7 @@ document print_htptr
389389
end
390390

391391
define print_htstr
392-
set $ind = 0
392+
set $ind = 0
393393
____print_ht $arg0 2
394394
end
395395

@@ -543,10 +543,10 @@ define printzn
543543
if $znode->op_type == 1
544544
set $optype = "IS_CONST"
545545
end
546-
if $znode->op_type == 2
546+
if $znode->op_type == 2
547547
set $optype = "IS_TMP_VAR"
548548
end
549-
if $znode->op_type == 4
549+
if $znode->op_type == 4
550550
set $optype = "IS_VAR"
551551
end
552552
if $znode->op_type == 8
@@ -576,11 +576,11 @@ end
576576

577577
document printzn
578578
print type and content of znode.
579-
usage: printzn &opline->op1
579+
usage: printzn &opline->op1
580580
end
581581

582582
define printzops
583-
printf "op1 => "
583+
printf "op1 => "
584584
printzn &execute_data->opline.op1
585585
printf "op2 => "
586586
printzn &execute_data->opline.op2

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ addons:
2020
- libt1-dev
2121

2222
notifications:
23-
email:
23+
email:
2424
on_failure: change
2525
irc:
2626
template:
@@ -30,7 +30,7 @@ notifications:
3030
on_success: change
3131
on_failure: always
3232

33-
cache:
33+
cache:
3434
- apt
3535

3636
env:
@@ -51,13 +51,13 @@ before_script:
5151
- sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
5252
# Compile PHP
5353
- ./travis/compile.sh
54-
# Setup Extensions
54+
# Setup Extensions
5555
- . ./travis/ext/mysql/setup.sh
5656
- . ./travis/ext/mysqli/setup.sh
5757
- . ./travis/ext/pdo_mysql/setup.sh
5858
- . ./travis/ext/pgsql/setup.sh
5959
- . ./travis/ext/pdo_pgsql/setup.sh
6060

61-
# Run PHPs run-tests.php
61+
# Run PHPs run-tests.php
6262
script:
6363
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120

CODING_STANDARDS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ User Functions/Methods Naming Conventions
113113
of ``parent_*``::
114114

115115
A family of 'foo' functions, for example:
116-
116+
117117
Good:
118118
'foo_select_bar'
119119
'foo_insert_baz'

EXTENSIONS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ MAINTENANCE: Odd fixes
7979
STATUS: Working
8080
-------------------------------------------------------------------------------
8181
EXTENSION: mysqli
82-
PRIMARY MAINTAINER: Georg Richter <[email protected]>, Andrey Hristov <[email protected]>, Johannes Schl�ter <[email protected]>, Ulf Wendel <[email protected]>
82+
PRIMARY MAINTAINER: Georg Richter <[email protected]>, Andrey Hristov <[email protected]>, Johannes Schl�ter <[email protected]>, Ulf Wendel <[email protected]>
8383
MAINTENANCE: Maintained
8484
STATUS: Working
8585
SINCE: 5.0
8686
-------------------------------------------------------------------------------
8787
EXTENSION: mysqlnd
88-
PRIMARY MAINTAINER: Andrey Hristov <[email protected]>, Johannes Schl�ter <[email protected]>, Ulf Wendel <[email protected]>
88+
PRIMARY MAINTAINER: Andrey Hristov <[email protected]>, Johannes Schl�ter <[email protected]>, Ulf Wendel <[email protected]>
8989
MAINTENANCE: Maintained
9090
STATUS: Working
9191
SINCE: 5.3
@@ -99,7 +99,7 @@ EXTENSION: odbc
9999
PRIMARY MAINTAINER: Daniel R. Kalowsky <[email protected]>
100100
MAINTENANCE: Maintained
101101
STATUS: Working
102-
COMMENT: Working
102+
COMMENT: Working
103103
-------------------------------------------------------------------------------
104104
EXTENSION: pdo
105105
PRIMARY MAINTAINER: Ilia Alshanetsky <[email protected]>, Wez Furlong <[email protected]>
@@ -195,12 +195,12 @@ MAINTENANCE: Maintained
195195
STATUS: Working
196196
-------------------------------------------------------------------------------
197197
EXTENSION: libxml
198-
PRIMARY MAINTAINER: Rob Richards <[email protected]>, Christian Stocker <[email protected]>
198+
PRIMARY MAINTAINER: Rob Richards <[email protected]>, Christian Stocker <[email protected]>
199199
MAINTENANCE: Maintained
200200
STATUS: Working
201201
-------------------------------------------------------------------------------
202202
EXTENSION: xmlreader
203-
PRIMARY MAINTAINER: Rob Richards <[email protected]>, Christian Stocker <[email protected]>
203+
PRIMARY MAINTAINER: Rob Richards <[email protected]>, Christian Stocker <[email protected]>
204204
MAINTENANCE: Maintained
205205
STATUS: Working
206206
-------------------------------------------------------------------------------

LICENSE

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
--------------------------------------------------------------------
1+
--------------------------------------------------------------------
22
The PHP License, version 3.01
33
Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
4-
--------------------------------------------------------------------
4+
--------------------------------------------------------------------
55

66
Redistribution and use in source and binary forms, with or without
77
modification, is permitted provided that the following conditions
88
are met:
99

1010
1. Redistributions of source code must retain the above copyright
1111
notice, this list of conditions and the following disclaimer.
12-
12+
1313
2. Redistributions in binary form must reproduce the above copyright
1414
notice, this list of conditions and the following disclaimer in
1515
the documentation and/or other materials provided with the
1616
distribution.
17-
17+
1818
3. The name "PHP" must not be used to endorse or promote products
1919
derived from this software without prior written permission. For
2020
written permission, please contact [email protected].
21-
21+
2222
4. Products derived from this software may not be called "PHP", nor
2323
may "PHP" appear in their name, without prior written permission
2424
from [email protected]. You may indicate that your software works in
2525
conjunction with PHP by saying "Foo for PHP" instead of calling
2626
it "PHP Foo" or "phpfoo"
27-
27+
2828
5. The PHP Group may publish revised and/or new versions of the
2929
license from time to time. Each version will be given a
3030
distinguishing version number.
@@ -41,27 +41,27 @@ are met:
4141
"This product includes PHP software, freely available from
4242
<http://www.php.net/software/>".
4343

44-
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
4545
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46-
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
4747
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48-
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
5151
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
5252
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
5353
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
5454
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
5555
OF THE POSSIBILITY OF SUCH DAMAGE.
5656

57-
--------------------------------------------------------------------
57+
--------------------------------------------------------------------
5858

5959
This software consists of voluntary contributions made by many
6060
individuals on behalf of the PHP Group.
6161

6262
The PHP Group can be contacted via Email at [email protected].
6363

64-
For more information on the PHP Group and the PHP project,
64+
For more information on the PHP Group and the PHP project,
6565
please see <http://www.php.net>.
6666

6767
PHP includes the Zend Engine, freely available at

Makefile.gcov

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ php_lcov.info: lcov-test
6262
rm -rf lcov_data/$$dir ; \
6363
fi; \
6464
done
65-
@echo
65+
@echo
6666
@echo "Generating $@"
6767
@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
6868

0 commit comments

Comments
 (0)