Skip to contentSkip to conversation

udev: remove the compile warning

PATCH Applied Yin Kangkai 2 participants 2 messages Aug 6, 2010 – Aug 8, 2010

lore
Share & tools
lore

Yin Kangkai

author
#0 lore raw

PATCH 3/3 udev: remove the compile warning

From 9d9167e76771e2310ce073ebee14cf0919860ac1 Mon Sep 17 00:00:00 2001
From: Yin Kangkai <[email protected]>
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 <[email protected]>
---
 libudev/libudev-private.h         |    4 ++--
 libudev/libudev-selinux-private.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
libudev/libudev-private.h +2 -2
index fa408f6..475f992 100644
@@ -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
libudev/libudev-selinux-private.c +1 -1
index 2d4463d..be68aa1 100644
@@ -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];
Signature · 1 line
1.6.5
Applied
#1 lore raw

Hello Yin,

Yin Kangkai [2010-08-06 15:28 +0800]:

Quoted 1 line

udev: remove the compile warning

Thanks! Applied.

Martin

Signature · 2 lines
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)