From 58b17906f512866c2e34844fa497ecdf7f1e1e3d Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 3 Feb 2020 13:41:31 +0100
Subject: Apply tidy formatting

Mostly reindent PHP scripts to spaces.
---
 sapi/cli/generate_mime_type_map.php | 46 ++++++++++++++++++-------------------
 sapi/cli/php_cli_server.c           | 10 ++++----
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'sapi/cli')

diff --git a/sapi/cli/generate_mime_type_map.php b/sapi/cli/generate_mime_type_map.php
index b0176bb524..40f546ef83 100755
--- a/sapi/cli/generate_mime_type_map.php
+++ b/sapi/cli/generate_mime_type_map.php
@@ -8,36 +8,36 @@ $source = count($_SERVER['argv']) > 1 ? $_SERVER['argv'][1] : 'https://raw.githu
 // See if we can actually load it.
 $types = @file($source);
 if ($types === false) {
-	fprintf(STDERR, "Error: unable to read $source\n");
-	exit(1);
+    fprintf(STDERR, "Error: unable to read $source\n");
+    exit(1);
 }
 
 // Remove comments and flip into an extensions array.
 $extensions = [];
 array_walk($types, function ($line) use (&$extensions) {
-	$line = trim($line);
-	if ($line && $line[0] != '#') {
-		$fields = preg_split('/\s+/', $line);
-		if (count($fields) > 1) {
-			$mime = array_shift($fields);
-			foreach ($fields as $extension) {
-				$extensions[$extension] = $mime;
-			}
-		}
-	}
+    $line = trim($line);
+    if ($line && $line[0] != '#') {
+        $fields = preg_split('/\s+/', $line);
+        if (count($fields) > 1) {
+            $mime = array_shift($fields);
+            foreach ($fields as $extension) {
+                $extensions[$extension] = $mime;
+            }
+        }
+    }
 });
 
 $additional_mime_maps = [
-	"map" => "application/json",	// from commit: a0d62f08ae8cbebc88e5c92e08fca8d0cdc7309d
-	"jsm" => "application/javascript",
+    "map" => "application/json",	// from commit: a0d62f08ae8cbebc88e5c92e08fca8d0cdc7309d
+    "jsm" => "application/javascript",
 ];
 
 foreach($additional_mime_maps as $ext => $mime) {
-	if (!isset($extensions[$ext])) {
-		$extensions[$ext] = $mime;
-	} else {
-		printf(STDERR, "Ignored exist mime type: $ext => $mime\n");
-	}
+    if (!isset($extensions[$ext])) {
+        $extensions[$ext] = $mime;
+    } else {
+        printf(STDERR, "Ignored exist mime type: $ext => $mime\n");
+    }
 }
 
 ?>
@@ -66,15 +66,15 @@ foreach($additional_mime_maps as $ext => $mime) {
 #define PHP_CLI_SERVER_MIME_TYPE_MAP_H
 
 typedef struct php_cli_server_ext_mime_type_pair {
-	const char *ext;
-	const char *mime_type;
+    const char *ext;
+    const char *mime_type;
 } php_cli_server_ext_mime_type_pair;
 
 static const php_cli_server_ext_mime_type_pair mime_type_map[] = {
 <?php foreach ($extensions as $extension => $mime): ?>
-	{ "<?= addcslashes($extension, "\0..\37!@\@\177..\377") ?>", "<?= addcslashes($mime, "\0..\37!@\@\177..\377") ?>" },
+    { "<?= addcslashes($extension, "\0..\37!@\@\177..\377") ?>", "<?= addcslashes($mime, "\0..\37!@\@\177..\377") ?>" },
 <?php endforeach ?>
-	{ NULL, NULL }
+    { NULL, NULL }
 };
 
 #endif /* PHP_CLI_SERVER_MIME_TYPE_MAP_H */
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index f00d8dee54..bd48afb1f7 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -510,7 +510,7 @@ static int sapi_cli_server_startup(sapi_module_struct *sapi_module) /* {{{ */
 
 		if (php_cli_server_workers_max > 1) {
 			zend_long php_cli_server_worker;
-			
+
 			php_cli_server_workers = calloc(
 				php_cli_server_workers_max, sizeof(pid_t));
 			if (!php_cli_server_workers) {
@@ -528,7 +528,7 @@ static int sapi_cli_server_startup(sapi_module_struct *sapi_module) /* {{{ */
 
 				if (pid == FAILURE) {
 					/* no more forks allowed, work with what we have ... */
-					php_cli_server_workers_max = 
+					php_cli_server_workers_max =
 						php_cli_server_worker + 1;
 					return SUCCESS;
 				} else if (pid == SUCCESS) {
@@ -2321,14 +2321,14 @@ static void php_cli_server_dtor(php_cli_server *server) /* {{{ */
 			 int php_cli_server_worker_status;
 
 			 do {
-				if (waitpid(php_cli_server_workers[php_cli_server_worker], 
-						   &php_cli_server_worker_status, 
+				if (waitpid(php_cli_server_workers[php_cli_server_worker],
+						   &php_cli_server_worker_status,
 						   0) == FAILURE) {
 					/* an extremely bad thing happened */
 					break;
 				}
 
-			 } while (!WIFEXITED(php_cli_server_worker_status) && 
+			 } while (!WIFEXITED(php_cli_server_worker_status) &&
 					  !WIFSIGNALED(php_cli_server_worker_status));
 		}
 
-- 
cgit v1.2.1