aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-13 00:43:20 -0700
committerDavid S. Miller <davem@davemloft.net>2012-03-13 00:43:20 -0700
commit5f0bdb18942a9749303ebb17ac8d080872557974 (patch)
tree8d75407edebd3a52ed59a1184f9450f2b99d8cf4
parent09a3453f637006538b45f9da69d1895d26a15473 (diff)
downloadglibc-5f0bdb18942a9749303ebb17ac8d080872557974.tar
glibc-5f0bdb18942a9749303ebb17ac8d080872557974.tar.gz
glibc-5f0bdb18942a9749303ebb17ac8d080872557974.tar.bz2
glibc-5f0bdb18942a9749303ebb17ac8d080872557974.zip
Fix warning in Linux openat implementation when __ASSUME_ATFCTS is set.
* sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Declare syscall 'err' in the ifdef scope in which it is actually used.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/openat.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dc93fce69e..906df52dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-03-13 David S. Miller <davem@davemloft.net>
+ * sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Declare syscall
+ 'err' in the ifdef scope in which it is actually used.
+
* nss/nss_db/db-init.c: Include string.h
2012-03-12 David S. Miller <davem@davemloft.net>
diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c
index 11e673fe61..62ea1e3c97 100644
--- a/sysdeps/unix/sysv/linux/openat.c
+++ b/sysdeps/unix/sysv/linux/openat.c
@@ -84,7 +84,6 @@ OPENAT_NOT_CANCEL (fd, file, oflag, mode)
oflag |= MORE_OFLAGS;
#endif
- INTERNAL_SYSCALL_DECL (err);
int res;
#ifdef __NR_openat
@@ -104,6 +103,7 @@ OPENAT_NOT_CANCEL (fd, file, oflag, mode)
#endif
#ifndef __ASSUME_ATFCTS
+ INTERNAL_SYSCALL_DECL (err);
char *buf = NULL;
if (fd != AT_FDCWD && file[0] != '/')