From: Jim Meyering <jim@meyering.net>
Date: Sun, 26 Nov 2006 17:35:38 +0000 (+0100)
Subject: * src/rm.c (main): Remove unnecessary (assuming C99) braces.
X-Git-Tag: COREUTILS-6_7~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ec7811e82d7e706d886bb209d1520eeb6cc2525;p=thirdparty%2Fcoreutils.git

* src/rm.c (main): Remove unnecessary (assuming C99) braces.
---

diff --git a/ChangeLog b/ChangeLog
index 4427eb944b..a1e873d494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-26  Jim Meyering  <jim@meyering.net>
+
+	* src/rm.c (main): Remove unnecessary (assuming C99) braces.
+
 2006-11-26  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port parts of the code to C89 to minimize the need for c99-to-c89.diff,
diff --git a/src/rm.c b/src/rm.c
index 0c93a040a0..364a21cf5d 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -355,22 +355,20 @@ main (int argc, char **argv)
 	       quote ("/"));
     }
 
-  {
-    size_t n_files = argc - optind;
-    char const *const *file = (char const *const *) argv + optind;
-
-    if (prompt_once && (x.recursive || 3 < n_files))
-      {
-	fprintf (stderr,
-		 (x.recursive
-		  ? _("%s: remove all arguments recursively? ")
-		  : _("%s: remove all arguments? ")),
-		 program_name);
-	if (!yesno ())
-	  exit (EXIT_SUCCESS);
-      }
-    enum RM_status status = rm (n_files, file, &x);
-    assert (VALID_STATUS (status));
-    exit (status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS);
-  }
+  size_t n_files = argc - optind;
+  char const *const *file = (char const *const *) argv + optind;
+
+  if (prompt_once && (x.recursive || 3 < n_files))
+    {
+      fprintf (stderr,
+	       (x.recursive
+		? _("%s: remove all arguments recursively? ")
+		: _("%s: remove all arguments? ")),
+	       program_name);
+      if (!yesno ())
+	exit (EXIT_SUCCESS);
+    }
+  enum RM_status status = rm (n_files, file, &x);
+  assert (VALID_STATUS (status));
+  exit (status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS);
 }