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

diff --git a/ChangeLog b/ChangeLog
index 4427eb9..a1e873d 100644 (file)
--- 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,
 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 0c93a04..364a21c 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -355,22 +355,20 @@ main (int argc, char **argv)
               quote ("/"));
     }
 
               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);

 }
 }