FYI
>From e690ea62e6d088cb4b0886e7652a84de9dbbe210 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Thu, 20 Aug 2009 16:11:45 +0200
Subject: [PATCH] selinux-at.h: avoid a dirfd shadowing warning
* lib/selinux-at.h: Rename all parameters: s/dirfd/dir_fd/
to avoid shadowing a global declaration.
Reported by Eric Blake.
---
ChangeLog | 7 +++++++
lib/selinux-at.h | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b89a483..2ef01b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-20 Jim Meyering <meyer...@redhat.com>
+
+ selinux-at.h: avoid a dirfd shadowing warning
+ * lib/selinux-at.h: Rename all parameters: s/dirfd/dir_fd/
+ to avoid shadowing a global declaration.
+ Reported by Eric Blake.
+
2009-08-19 Akim Demaille <demai...@gostai.com>
bootstrap: find sha1sum when named gsha1sum.
diff --git a/lib/selinux-at.h b/lib/selinux-at.h
index 9716fe9..5d260f1 100644
--- a/lib/selinux-at.h
+++ b/lib/selinux-at.h
@@ -31,22 +31,22 @@
must be freed with freecon. Upon error, set *CON to NULL, set errno
and return -1.
[*] with flags=0 here, with flags=AT_SYMLINK_NOFOLLOW for lgetfileconat */
-int getfileconat (int dirfd, char const *file, security_context_t *con);
+int getfileconat (int dir_fd, char const *file, security_context_t *con);
/* dir-fd-relative lgetfilecon. This function is just like getfileconat,
except when DIRFD and FILE specify a symlink: lgetfileconat operates on
the symlink, while getfileconat operates on the referent of the symlink. */
-int lgetfileconat (int dirfd, char const *file, security_context_t *con);
+int lgetfileconat (int dir_fd, char const *file, security_context_t *con);
/* dir-fd-relative setfilecon. Set the SELinux security context of
the file specified by DIRFD and FILE to CON. DIRFD and FILE are
interpreted as for fstatat[*]. Upon success, return 0.
Otherwise, return -1 and set errno. */
-int setfileconat (int dirfd, char const *file, security_context_t con);
+int setfileconat (int dir_fd, char const *file, security_context_t con);
/* dir-fd-relative lsetfilecon. This function is just like setfileconat,
except that rather than dereferencing a symlink, this function affects it.
*/
/* dir-fd-relative lsetfilecon. This function is just like setfileconat,
except when DIRFD and FILE specify a symlink: lsetfileconat operates on
the symlink, while setfileconat operates on the referent of the symlink. */
-int lsetfileconat (int dirfd, char const *file, security_context_t con);
+int lsetfileconat (int dir_fd, char const *file, security_context_t con);
--
1.6.4.378.g88f2f
