* [PATCH 3/3] udev: remove the compile warning
@ 2010-08-06 7:28 Yin Kangkai
2010-08-08 18:38 ` Martin Pitt
0 siblings, 1 reply; 2+ messages in thread
From: Yin Kangkai @ 2010-08-06 7:28 UTC (permalink / raw)
To: linux-hotplug
From 9d9167e76771e2310ce073ebee14cf0919860ac1 Mon Sep 17 00:00:00 2001
From: Yin Kangkai <kangkai.yin@intel.com>
Date: Fri, 6 Aug 2010 15:08:51 +0800
Subject: [PATCH 3/3] udev: remove the compile warning
CC udev/udevd.o
In file included from udev/udev.h:27,
from udev/udevd.c:47:
./libudev/libudev-private.h: In function ‘udev_selinux_setfscreateconat’:
./libudev/libudev-private.h:230: warning: declaration of ‘dirfd’ shadows a global declaration
/usr/include/dirent.h:224: warning: shadowed declaration is here
Signed-off-by: Yin Kangkai <kangkai.yin@intel.com>
---
libudev/libudev-private.h | 4 ++--
libudev/libudev-selinux-private.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index fa408f6..475f992 100644
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -227,14 +227,14 @@ static inline void udev_selinux_init(struct udev *udev) {}
static inline void udev_selinux_exit(struct udev *udev) {}
static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
-static inline void udev_selinux_setfscreateconat(struct udev *udev, int dirfd, const char *file, unsigned int mode) {}
+static inline void udev_selinux_setfscreateconat(struct udev *udev, int dfd, const char *file, unsigned int mode) {}
static inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
#else
void udev_selinux_init(struct udev *udev);
void udev_selinux_exit(struct udev *udev);
void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
-void udev_selinux_setfscreateconat(struct udev *udev, int dirfd, const char *file, unsigned int mode);
+void udev_selinux_setfscreateconat(struct udev *udev, int dfd, const char *file, unsigned int mode);
void udev_selinux_resetfscreatecon(struct udev *udev);
#endif
diff --git a/libudev/libudev-selinux-private.c b/libudev/libudev-selinux-private.c
index 2d4463d..be68aa1 100644
--- a/libudev/libudev-selinux-private.c
+++ b/libudev/libudev-selinux-private.c
@@ -83,7 +83,7 @@ void udev_selinux_resetfscreatecon(struct udev *udev)
err(udev, "setfscreatecon failed: %m\n");
}
-void udev_selinux_setfscreateconat(struct udev *udev, int dirfd, const char *file, unsigned int mode)
+void udev_selinux_setfscreateconat(struct udev *udev, int dfd, const char *file, unsigned int mode)
{
char filename[UTIL_PATH_SIZE];
--
1.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3/3] udev: remove the compile warning
2010-08-06 7:28 [PATCH 3/3] udev: remove the compile warning Yin Kangkai
@ 2010-08-08 18:38 ` Martin Pitt
0 siblings, 0 replies; 2+ messages in thread
From: Martin Pitt @ 2010-08-08 18:38 UTC (permalink / raw)
To: linux-hotplug
Hello Yin,
Yin Kangkai [2010-08-06 15:28 +0800]:
> udev: remove the compile warning
Thanks! Applied.
Martin
--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-08 18:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-06 7:28 [PATCH 3/3] udev: remove the compile warning Yin Kangkai
2010-08-08 18:38 ` Martin Pitt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.