diff options
| author | Yin Kangkai <kangkai.yin@intel.com> | 2010-08-06 15:08:51 +0800 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2010-08-08 20:37:37 +0200 |
| commit | ae8011a084fec398bd6e94694a5d6aca15b3c7a9 (patch) | |
| tree | b201cb376b480875f09a9eb3194a5f66b2780cdf /libudev | |
| parent | 08f11597f2618d46b23f0e747a41a0ee960bcf1b (diff) | |
udev: fix 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>
Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
Diffstat (limited to 'libudev')
| -rw-r--r-- | libudev/libudev-private.h | 4 | ||||
| -rw-r--r-- | 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 fa408f6ae6..475f992ba7 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 2d4463d864..be68aa1c2b 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]; |