Skip to content
This repository was archived by the owner on Aug 24, 2021. It is now read-only.

Commit 37c329d

Browse files
committed
Trim trailing whitespace in source code files
1 parent 6c2c7da commit 37c329d

File tree

123 files changed

+2702
-2703
lines changed

Some content is hidden

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

123 files changed

+2702
-2703
lines changed

.appveyor.yml

+1-1
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

+10-10
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
- postgresql
2626

2727
notifications:
28-
email:
28+
email:
2929
on_failure: change
3030
irc:
3131
template:
@@ -67,7 +67,7 @@ before_script:
6767
- . ./travis/ext/pgsql/setup.sh
6868
- . ./travis/ext/pdo_pgsql/setup.sh
6969

70-
# Run PHPs run-tests.php
70+
# Run PHPs run-tests.php
7171
script:
7272
- ./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 --show-slow 1000 --set-timeout 120
7373

CODING_STANDARDS

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ User Functions/Methods Naming Conventions
112112
of ``parent_*``::
113113

114114
A family of 'foo' functions, for example:
115-
115+
116116
Good:
117117
'foo_select_bar'
118118
'foo_insert_baz'

LICENSE

+13-13
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

+1-1
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

NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ PHP NEWS
3131
. Lifted requirements to SQLite 3.5.0. (cmb)
3232

3333
- Standard:
34-
. Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
34+
. Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
3535
stream_socket_client). (Ville Hukkamäki)
3636

3737
- Reflection:

README.EXT_SKEL

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ HOW TO USE IT
1111

1212
and everything you need will be placed in directory ext/extension_name.
1313

14-
If you don't need to test the existence of any external header files,
15-
libraries or functions in them, the extension is ready to be compiled in
14+
If you don't need to test the existence of any external header files,
15+
libraries or functions in them, the extension is ready to be compiled in
1616
PHP. To compile the extension, run the following:
1717

1818
./buildconf; ./configure --enable-extension_name; make
@@ -24,7 +24,7 @@ HOW TO USE IT
2424

2525
SOURCE AND HEADER FILE NAME
2626

27-
The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h'
27+
The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h'
2828
as the main source and header files. Keep these names.
2929

3030
extension functions (User functions) must be named

README.NEW-OUTPUT-API

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
API adjustment to the old output control code:
22

3-
Everything now resides beneath the php_output namespace,
3+
Everything now resides beneath the php_output namespace,
44
and there's an API call for every output handler op.
55

66
Checking output control layers status:
@@ -131,7 +131,7 @@ Output handler hooks
131131
Open questions
132132

133133
Should the userland API be adjusted and unified?
134-
134+
135135
Many bits of the manual (and very first implementation) do not comply
136136
with the behaviour of the current (to be obsoleted) code, thus should
137137
the manual or the behaviour be adjusted?

README.PARAMETER_PARSING_API

+9-9
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
4949

5050
Type specifiers
5151
---------------
52-
The following list shows the type specifier, its meaning and the parameter
52+
The following list shows the type specifier, its meaning and the parameter
5353
types that need to be passed by address. All passed parameters are set
54-
if the PHP parameter is non optional and untouched if optional and the
54+
if the PHP parameter is non optional and untouched if optional and the
5555
parameter is not present. The only exception is O where the zend_class_entry*
56-
has to be provided on input and is used to verify the PHP parameter is an
56+
has to be provided on input and is used to verify the PHP parameter is an
5757
instance of that class.
5858

5959
a - array (zval*)
6060
A - array or object (zval*)
6161
b - boolean (zend_bool)
6262
C - class (zend_class_entry*)
6363
d - double (double)
64-
f - function or array containing php method call info (returned as
64+
f - function or array containing php method call info (returned as
6565
zend_fcall_info and zend_fcall_info_cache)
6666
h - array (returned as HashTable*)
6767
H - array or HASH_OF(object) (returned as HashTable*)
@@ -95,9 +95,9 @@ Type specifiers
9595

9696
Note on 64bit compatibility
9797
---------------------------
98-
Please note that since version 7 PHP uses zend_long as integer type and
99-
zend_string with size_t as length, so make sure you pass zend_longs to "l"
100-
and size_t to strings length (i.e. for "s" you need to pass char * and size_t),
98+
Please note that since version 7 PHP uses zend_long as integer type and
99+
zend_string with size_t as length, so make sure you pass zend_longs to "l"
100+
and size_t to strings length (i.e. for "s" you need to pass char * and size_t),
101101
not the other way round!
102102

103103
Both mistakes might cause memory corruptions and segfaults:
@@ -110,7 +110,7 @@ Both mistakes might cause memory corruptions and segfaults:
110110
int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
111111
zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)
112112

113-
If you're in doubt, use check_parameters.php script to the parameters
113+
If you're in doubt, use check_parameters.php script to the parameters
114114
and their types (it can be found in ./scripts/dev/ directory of PHP sources):
115115

116116
# php ./scripts/dev/check_parameters.php /path/to/your/sources/
@@ -159,7 +159,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
159159
/* Get either a set of 3 longs or a string. */
160160
zend_long l1, l2, l3;
161161
char *s;
162-
/*
162+
/*
163163
* The function expects a pointer to a size_t in this case, not a long
164164
* or any other type. If you specify a type which is larger
165165
* than a 'size_t', the upper bits might not be initialized

README.RELEASE_PROCESS

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ team (Bjori) on hand.
3232
6. Verify the tags to be extra sure everything was tagged properly.
3333

3434
7. Moving extensions from/to PECL requires write access to the destination.
35-
Most developers should have this.
35+
Most developers should have this.
3636

3737
Moving extensions from php-src to PECL
3838
- Checkout the pecl directory, most likely you want a sparse-root checkout
@@ -125,7 +125,7 @@ Getting the non stable release (alpha/beta/RC) announced
125125

126126
b. ``$PHP_x_RC_DATE`` = "06 September 2007"
127127

128-
3. Add a short notice to phpweb stating that there is a new release, and
128+
3. Add a short notice to phpweb stating that there is a new release, and
129129
highlight the major important things (security fixes) and when it is important
130130
to upgrade.
131131

@@ -140,7 +140,7 @@ to upgrade.
140140

141141
*Wait for web and qa sites to update with new information before sending announce*
142142

143-
5. Send **separate** emails **To** ``[email protected]`` and ``[email protected]``
143+
5. Send **separate** emails **To** ``[email protected]`` and ``[email protected]``
144144
lists pointing out "the location of the release" and "the possible release date of
145145
either the next RC, or the final release". Include in this information the verification
146146
information output by ``gen_verify_stub``.
@@ -194,7 +194,7 @@ can be influenced by defining the environment variable TAR_OPTIONS='--format=gnu
194194
``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
195195

196196
11. Commit and push all the tarballs and signature files to web/php-distributions.git,
197-
then update the git submodule reference in web/php.git:
197+
then update the git submodule reference in web/php.git:
198198
``git submodule init;
199199
git submodule update;
200200
cd distributions;
@@ -266,7 +266,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
266266
IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
267267

268268
V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
269-
269+
270270
e. You may want to try php-web/bin/news2html to automate this task
271271

272272
6. Add a short notice to phpweb stating that there is a new release, and
@@ -340,7 +340,7 @@ Forking a new release branch
340340

341341
2. Just prior to cutting X.Y.0beta1, create the new branch locally.
342342
Add a commit on master after the branch point clearing the NEWS, UPGRADING
343-
and UPGRADING.INTERNALS files, updating the version in configure.ac (run
343+
and UPGRADING.INTERNALS files, updating the version in configure.ac (run
344344
./configure to automatically update main/php_versions.h, too) and Zend/zend.h.
345345
Also list the new branch in README.GIT-RULES.
346346
Example: http://git.php.net/?p=php-src.git;a=commit;h=a63c99b
@@ -365,7 +365,7 @@ New Release Manager Checklist
365365
one or more of the previous RMs sign your key. Publish your public key to pgp.mit.edu with:
366366
`gpg --keyserver pgp.mit.edu --send-keys $KEYID`
367367

368-
3. Request karma to edit main/php_version.h. Possibly karma for other restricted parts of
368+
3. Request karma to edit main/php_version.h. Possibly karma for other restricted parts of
369369
php-src might come in question.
370370

371371
4. Request karma for web/qa.git and web/php.git for publishing release announcements.

0 commit comments

Comments
 (0)