From: Eric Blake <ebb9@byu.net>
Date: Mon, 30 Nov 2009 13:45:42 +0000 (-0700)
Subject: utimens: fix compilation error
X-Git-Tag: v0.1~5110
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=52f2ca7c62445ecc1dadbba8a709421e0290f7d2;p=gnulib.git

utimens: fix compilation error

Fixes a regression from 2009-11-25.

* lib/utimens.c (lutimens) [!HAVE_UTIMENSAT && HAVE_LUTIMES]:
Declare variable at right scope.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 3d04361fe..07918de20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-30  Eric Blake  <ebb9@byu.net>
+
+	utimens: fix compilation error
+	* lib/utimens.c (lutimens) [!HAVE_UTIMENSAT && HAVE_LUTIMES]:
+	Declare variable at right scope.
+
 2009-11-29  Jim Meyering  <meyering@redhat.com>
 
 	bootstrap: handle perl-5.11's changed --version output
diff --git a/lib/utimens.c b/lib/utimens.c
index 9e66ffca6..5603600bf 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -368,6 +368,7 @@ lutimens (char const *file, struct timespec const timespec[2])
   struct timespec *ts = timespec ? adjusted_timespec : NULL;
   int adjustment_needed = 0;
   struct stat st;
+  int result;
 
   if (ts)
     {
@@ -386,7 +387,7 @@ lutimens (char const *file, struct timespec const timespec[2])
 #if HAVE_UTIMENSAT
   if (0 <= lutimensat_works_really)
     {
-      int result = utimensat (AT_FDCWD, file, ts, AT_SYMLINK_NOFOLLOW);
+      result = utimensat (AT_FDCWD, file, ts, AT_SYMLINK_NOFOLLOW);
 # ifdef __linux__
       /* Work around a kernel bug:
          http://bugzilla.redhat.com/442352