Skip to content

Commit 34172dd

Browse files
authored
Merge pull request #7 from Sobak/fix/reduce-unrelated-changes
Reduce unrelated changes comparing to original
2 parents e20171a + 10249ff commit 34172dd

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

configure.php

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
| Hannes Magnusson <bjori@php.net> |
2020
| Gwynne Raskind <gwynne@php.net> |
2121
+----------------------------------------------------------------------+
22-
22+
2323
$Id$
2424
*/
2525

@@ -31,7 +31,7 @@
3131
function usage() // {{{
3232
{
3333
global $acd;
34-
34+
3535
echo <<<HELPCHUNK
3636
configure.php configures this package to adapt to many kinds of systems, and PhD
3737
builds too.
@@ -66,7 +66,7 @@ function usage() // {{{
6666
--with-php=PATH Path to php CLI executable [detect]
6767
--with-lang=LANG Language to build [{$acd['LANG']}]
6868
--with-partial=my-xml-id Root ID to build (e.g. <book xml:id="MY-ID">) [{$acd['PARTIAL']}]
69-
--disable-broken-file-listing Do not ignore translated files in
69+
--disable-broken-file-listing Do not ignore translated files in
7070
broken-files.txt
7171
--redirect-stderr-to-stdout Redirect STDERR to STDOUT. Use STDOUT as the
7272
standard output for XML errors [{$acd['STDERR_TO_STDOUT']}]
@@ -97,7 +97,7 @@ function is_windows() {
9797
function checking($for) // {{{
9898
{
9999
global $ac;
100-
100+
101101
if ($ac['quiet'] != 'yes') {
102102
echo "Checking {$for}... ";
103103
flush();
@@ -107,7 +107,7 @@ function checking($for) // {{{
107107
function checkerror($msg) // {{{
108108
{
109109
global $ac;
110-
110+
111111
if ($ac['quiet'] != 'yes') {
112112
echo "\n";
113113
}
@@ -118,7 +118,7 @@ function checkerror($msg) // {{{
118118
function checkvalue($v) // {{{
119119
{
120120
global $ac;
121-
121+
122122
if ($ac['quiet'] != 'yes') {
123123
echo "{$v}\n";
124124
}
@@ -315,7 +315,7 @@ function print_xml_errors($details = true) {
315315
} else {
316316
continue;
317317
}
318-
318+
319319
$overridden_settings[] = strtoupper($o);
320320
switch ($o) {
321321
case 'h':
@@ -399,7 +399,7 @@ function print_xml_errors($details = true) {
399399
case 'basedir':
400400
$ac['basedir'] = $v;
401401
break;
402-
402+
403403
case 'output':
404404
$ac['OUTPUT_FILENAME'] = $v;
405405
break;
@@ -414,7 +414,7 @@ function print_xml_errors($details = true) {
414414
case 'stderr-to-stdout':
415415
$ac['STDERR_TO_STDOUT'] = $v;
416416
break;
417-
417+
418418
case '':
419419
break;
420420

@@ -676,7 +676,7 @@ function print_xml_errors($details = true) {
676676
echo "done.\n";
677677
echo "Partial manual saved to {$filename}. To build it, run 'phd -d {$filename}'\n";
678678
exit(0);
679-
} // }}}
679+
} // }}}
680680

681681
$mxml = $ac["OUTPUT_FILENAME"];
682682
if ($dom->validate()) {
@@ -722,7 +722,7 @@ function print_xml_errors($details = true) {
722722
echo "\nThe document didn't validate, ";
723723

724724
// Allow the .manual.xml file to be created, even if it is not valid.
725-
if ($ac['FORCE_DOM_SAVE'] == 'yes') {
725+
if ($ac['FORCE_DOM_SAVE'] == 'yes') {
726726
printf("writing %s anyway, and ", basename($ac["OUTPUT_FILENAME"]));
727727
if ($ac["SEGFAULT_SPEED"] == "yes") {
728728
$t = $dom->doctype;
@@ -757,3 +757,4 @@ function print_xml_errors($details = true) {
757757
errors_are_bad(1); // Tell the shell that this script finished with an error.
758758
}
759759
?>
760+

scripts/revcheck.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ function get_original_info($file, $hash)
142142
// Grabs the revision tag and stores credits from the file given
143143
function get_tags($file, $val = "en-rev") {
144144

145-
global $LANG, $DOCDIR;
146-
$basefile = substr($file, strlen($LANG) + 3);
145+
global $LANG, $DOCDIR;
146+
$basefile = substr($file, strlen($LANG) + 3);
147147

148-
// Read the first 500 chars. The comment should be at
148+
// Read the first 500 chars. The comment should be at
149149
// the begining of the file
150150

151151
$fp = @fopen($file, "r") or die ("Unable to read $file.");
@@ -155,8 +155,8 @@ function get_tags($file, $val = "en-rev") {
155155
// Check for English SVN revision tag (. is for $ in the preg!),
156156
// Return if this was needed (it should be there)
157157
if ($val == "en-rev") {
158-
exec('cd ' . $DOCDIR . '/' . $LANG . ' && git log -1 --pretty=format:"%h %at" ' . $basefile, $result, $output);
159-
return new DateTimeImmutable('@' . explode(' ', $result[0])[1]);
158+
exec('cd ' . $DOCDIR . '/' . $LANG . ' && git log -1 --pretty=format:"%h %at" ' . $basefile, $result, $output);
159+
return new DateTimeImmutable('@' . explode(' ', $result[0])[1]);
160160
}
161161

162162
// Handle credits (only if no maintainer is specified)
@@ -207,8 +207,8 @@ function get_tags($file, $val = "en-rev") {
207207
preg_match (
208208
"'<!--\s*EN-Revision:\s*(n/a)\s*Maintainer:\s*("
209209
. $val . ")\s*Status:\s*(.+)\s*-->'U",
210-
$line,
211-
$match
210+
$line,
211+
$match
212212
);
213213
}
214214

@@ -382,6 +382,7 @@ function get_dir_status($dir) {
382382

383383
// Walk through all names in the directory
384384
while ($file = @readdir($handle)) {
385+
385386
if (
386387
(!is_dir($dir.'/' .$file) && !in_array(substr($file, -3), array('xml','ent')) && substr($file, -13) != 'PHPEditBackup' )
387388
|| strpos($file, 'entities.') === 0

0 commit comments

Comments
 (0)