Skip to content

Commit 9fcc1bc

Browse files
committed
Remove redundant middle newlines in "Autotools" related files
This syncs few minor left-overs in "Autotools" related files: - redundant middle newlines removed (in man pages the duplicate newlines are also ignored and are not visible in the man page anyway) - Minor mixed indentation synced [skip ci]
1 parent 634708a commit 9fcc1bc

File tree

7 files changed

+2
-25
lines changed

7 files changed

+2
-25
lines changed

build/Makefile.global

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ distclean: clean
132132
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
133133
rm -f ext/phar/phar.phar ext/phar/phar.php
134134
if test "$(srcdir)" != "$(builddir)"; then \
135-
rm -f ext/phar/phar/phar.inc; \
135+
rm -f ext/phar/phar/phar.inc; \
136136
fi
137137

138138
prof-gen:

ext/phar/Makefile.frag

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
2929
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
3030
-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
3131

32-
3332
TEST_PHP_EXECUTABLE = $(shell $(PHP_EXECUTABLE) -v 2>&1)
3433
TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec format error')
3534

ext/phar/phar.1.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ Regular expression for input files to exclude.
116116
.B ...
117117
Directory to extract to (defaults to '.').
118118

119-
120119
.SH help command
121120
This help or help for a selected command.
122121
.P
@@ -165,7 +164,6 @@ Specifies a regular expression for input files.
165164
.B -x \fIregex\fP
166165
Regular expression for input files to exclude.
167166

168-
169167
.SH meta-del command
170168
Delete meta information of a PHAR entry or a PHAR package.
171169
.P
@@ -397,7 +395,6 @@ present.
397395
.B \-s \fIstub\fP
398396
Select the \fIstub\fP file.
399397

400-
401398
.SH tree command
402399
Get a directory tree for a PHAR archive.
403400
.P
@@ -420,7 +417,6 @@ Regular expression for input files to exclude.
420417
.SH version command
421418
Get information about the PHAR environment and the tool version.
422419

423-
424420
.SH COMPRESSION
425421
Algorithms:
426422
.TP 15

sapi/fpm/init.d.php-fpm.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ php_fpm_BIN=@sbindir@/php-fpm
1717
php_fpm_CONF=@sysconfdir@/php-fpm.conf
1818
php_fpm_PID=@localstatedir@/run/php-fpm.pid
1919

20-
2120
php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID"
2221

23-
2422
wait_for_pid () {
2523
try=0
2624

sapi/fpm/status.html.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<a href="http://validator.w3.org/check?uri=referer">
7575
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAMAAABUFvrSAAADAFBMVEUBAAAIBgMMCQQLCwsSDgYXEgkaFQoUFBQcHBwlHQ4rIhEwJhM2KxU7Lxc9MBgjIyMoKCg0MzI7OztBNBpOPh5OSz9TQiFeSyVkUChqVCpuWCx1Rzl0XC5+ZDFOTk5ST0tWUk1VVVVcXFxqXUplZWVra2twcHB7e3sAWpwIX58JYJ8OY6ERZaIVaKQaa6Yebaghb6klcqopdawxea82fbE4frI+grRFhrZMi7pVkb1alL9dlsBkm8NoncRtocZ0pcl8qsyWBAOZAACcCASIIBmdNiegDge3PB6mPiqBZzODaDSKbjaOcTiUdjuXeDyaez26QiG/TCaAeWihclPATifBUCjIXy/QbzfWej3Yfj+KgWWjgkGui0WxjUa0gVi3kkm6lEq+mEyjkmuzn2e7pnLFnU7eikXOpFHRp1PVqlXarlfesVjjlUrmm03poFDtqVTitFrmuFzqu13ywWD7xWL+y2WDg4OXl5eYmJippZ61rZisrKy0tLS/v7+Crs6FsNCLtNKQt9SWu9aYvNebvtifwdqjw9uox92ryd6yzeG20OPCwsLMzMzU1NTA1ufG2ujN3+zT4+7d6fL/7Mbn5+fs7Ozl7vXp8fbu9Pj09PTy9/r1+Pv+/v7MzMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADn4rtgAAAAnnRSTlP/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AD6H4/gAAAABYktHRP+lB/LFAAAACXBIWXMAAABIAAAASABGyWs+AAADSUlEQVRIx+2WaU8TURSGzyCLQEUxiFYtCEo8Da3sYglQbDUaluISV6pYFdsyop1Or8ElSgg2RSjgArSZ63/13JkOXRBZgn7yTXpmyzwz857lFhb3XW9/CsEi317f2c71/OnZ/+C9gSdDKmNySI2GorQNxiaDpFA4FgrS+WgoxFhwck/gMTjBwmCJ+WCYMQso5SBUoQCcZKwGgClg2QSOt7jp7pnWGQFJ2e0tpFYX5+k3TUn+QTOsqAV/hRRmJngiYAVrYILAkipT+C34GzqJ+AW7BDiBhga4VgdwIFmdNMBKMcAQI3Ctz1cOCmPD4hEKVBX5TpdYfg/m7bhC0YHrFHvQtbY2h840fw9Hzh8tO7CaSZ6V3k2AdWXBNdaKosGtwG78SLED4xSd+I1rbWK37ii5cO58pirCUglYBXhIjVlywWGQoluBl7CT83VE8nUZ28lu3ZUycUlLZ8CVUrgGnpgeR7JgZrUxHVzh9/tjAuzxbFRFM7nwGbGZ8wF083UHLlPqDuZWxSAZrBSXqmbyGBuBEQNM0sFCUQJf8QiyAXbRp7uwA5fI7iXei9ifotzlgiMy3R+NqKpMRiv6gUwVzfTAlAiLyUJkxVWPUAYcR5fWfCGB7jV00GOciJ0an95T5133GDLAKXTMY1/K3j6HPeJ42YEJvrAX8M0M1+y8LvJhnnejURmc92HvH2aFGtuWa4I/Ido1qgbElH48j235YNkiwbhxc6QKpJN56NiN18bOnQ2uCV5BvCRaEC8aqAS2rBp76bSRPFutCT4No8chkMu95vG+ynIve3KHUAvO6i04w2d7dCu6Fwxy00LGCpsJrixlQbAVfL/35Qb3VN5068M1vQW/UrG5U3EHxrXGH4IrJTfAxluqUMWicCjLva/zvC8Mf72388fmfIeIS61UIU60o2jFxbKGxsMwzQvfuKScyTREcxz2ZOV9XDCPtY/6ZoB+X/udzl6Rw2RDWfV7ngceonFxXIqMgj83eXey3Fe7HfRh0bAlondZQJKgXM2rsrsmd2rXK4j6ZHx8PMAmhM/y2CO1oH7vmdx9X0wfZLj7v0q/8Orcv7D8T039s/8VH7bVu2c718NbJrhuBzq2leo3nTlTX62DfwGZkKiGotSUXQAAAABJRU5ErkJggg==" alt="Valid XHTML 1.0 Transitional" height="31" width="88" />
7676
</a>
77-
</p>
77+
</p>
7878
<script type="text/javascript">
7979
<!--
8080
var xhr_object = null;
@@ -394,7 +394,6 @@
394394
r += ':';
395395
r += (t.getSeconds() < 10 ? '0' : '') + t.getSeconds();
396396

397-
398397
return r;
399398
}
400399

scripts/dev/check_parameters.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@
2020
define('VERSION', '7.0'); // minimum is 7.0
2121
define('PHPDIR', realpath(dirname(__FILE__) . '/../..'));
2222

23-
2423
// be sure you have enough memory and stack for PHP. pcre will push the limits!
2524
ini_set('pcre.backtrack_limit', 10000000);
2625

27-
2826
// ------------------------ end of config ----------------------------
2927

30-
3128
$API_params = array(
3229
'a' => array('zval**'), // array
3330
'A' => array('zval**'), // array or object
@@ -64,7 +61,6 @@ function error($str, $level = 0)
6461
}
6562
}
6663

67-
6864
/** this updates the global var $line (for error reporting) */
6965
function update_lineno($offset)
7066
{
@@ -99,7 +95,6 @@ function update_lineno($offset)
9995
} while (true);
10096
}
10197

102-
10398
/** parses the sources and fetches its vars name, type and if they are initialized or not */
10499
function get_vars($txt)
105100
{
@@ -124,7 +119,6 @@ function get_vars($txt)
124119
return $ret;
125120
}
126121

127-
128122
/** run diagnostic checks against one var. */
129123
function check_param($db, $idx, $exp, $optional, $allow_uninit = false)
130124
{
@@ -184,7 +178,6 @@ function get_params($vars, $str)
184178
return $ret;
185179
}
186180

187-
188181
/** run tests on a function. the code is passed in $txt */
189182
function check_function($name, $txt, $offset)
190183
{
@@ -291,7 +284,6 @@ function check_function($name, $txt, $offset)
291284
}
292285
}
293286

294-
295287
/** the main recursion function. splits files in functions and calls the other functions */
296288
function recurse($path)
297289
{
@@ -319,7 +311,6 @@ function recurse($path)
319311
if (count($split) < 2) continue; // no functions defined on this file
320312
array_shift($split); // the first part isn't relevant
321313

322-
323314
// generate the line offsets array
324315
$j = 0;
325316
$lines = preg_split("/(\r\n?|\n)/S", $txt, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -333,7 +324,6 @@ function recurse($path)
333324
$GLOBALS['lines_offset'] = $lines_offset;
334325
$GLOBALS['current_file'] = $file;
335326

336-
337327
for ($i = 0; $i < count($split); $i+=2) {
338328
// if the /* }}} */ comment is found use it to reduce false positives
339329
// TODO: check the other indexes

scripts/dev/find_tested.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env php
22
<?php
33

4-
54
$usage = <<<USAGE
65
76
Usage: php find_tested.php [path_to_test_files] ([extension])
@@ -16,7 +15,6 @@
1615
1716
USAGE;
1817

19-
2018
/* method record fields */
2119
define("CLASS_NAME", "CLASS_NAME");
2220
define("METHOD_NAME", "METHOD_NAME");
@@ -25,7 +23,6 @@
2523
define("IS_TESTED", "IS_TESTED");
2624
define("TESTS", "TESTS");
2725

28-
2926
// process command line args
3027
$num_params = $argc;
3128
if ($num_params < 2 || $num_params > 3) {
@@ -50,7 +47,6 @@
5047
$extension_name = false;
5148
}
5249

53-
5450
$method_info = populate_method_info();
5551

5652
if ($extension_name != false) {
@@ -224,5 +220,4 @@ function map_token_value($x) {
224220
return $x[1];
225221
}
226222

227-
228223
?>

0 commit comments

Comments
 (0)