[PATCH 1/2] maint: remove now-spurious curly braces

[Jim Meyering]

These address a couple of overdue FIXME comments:

>From b7332b889e083370293b143687df3e01bbca7539 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 3 Jun 2011 13:29:15 +0200
Subject: [PATCH 1/2] maint: remove now-spurious curly braces

* src/chown-core.c (restricted_chown): Remove FIXME comment and
superfluous curly braces.
---
 src/chown-core.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/chown-core.c b/src/chown-core.c
index 55f8a2d..26a272e 100644
--- a/src/chown-core.c
+++ b/src/chown-core.c
@@ -256,12 +256,10 @@ restricted_chown (int cwd_fd, char const *file,
         }
     }

-  { /* FIXME: remove these curly braces when we assume C99.  */
-    int saved_errno = errno;
-    close (fd);
-    errno = saved_errno;
-    return status;
-  }
+  int saved_errno = errno;
+  close (fd);
+  errno = saved_errno;
+  return status;
 }

 /* Change the owner and/or group of the file specified by FTS and ENT
--
1.7.6.rc0.254.gf37de


>From c2b25223c13ad7bb55bebbdf456a9040c030d10c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 3 Jun 2011 13:28:15 +0200
Subject: [PATCH 2/2] build: require at least 2-year old autoconf-2.64 (was
 2.62)

* configure.ac: Require autoconf-2.64, which is nearly two years old.
* src/system.h (emit_ancillary_info): Use PACKAGE_URL, now that we
require autoconf-2.64.
---
 configure.ac |    2 +-
 src/system.h |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3dbce5d..2e45f84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@

 dnl Written by Jim Meyering.

-AC_PREREQ([2.62])
+AC_PREREQ([2.64])

 # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which
 # indicates that it is built from the 219th delta (in _some_ repository)
diff --git a/src/system.h b/src/system.h
index 2e8e177..47aad02 100644
--- a/src/system.h
+++ b/src/system.h
@@ -593,9 +593,7 @@ emit_ancillary_info (void)
 {
   printf (_("\nReport %s bugs to %s\n"), last_component (program_name),
           PACKAGE_BUGREPORT);
-  /* FIXME 2010: use AC_PACKAGE_URL once we require autoconf-2.64 */
-  printf (_("%s home page: <http://www.gnu.org/software/%s/>\n"),
-          PACKAGE_NAME, PACKAGE);
+  printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
   fputs (_("General help using GNU software: <http://www.gnu.org/gethelp/>\n"),
          stdout);
   /* Don't output this redundant message for English locales.
--
1.7.6.rc0.254.gf37de