diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libudev/libudev.pc.in | 1 | ||||
| -rw-r--r-- | src/shared/label.c | 1 | ||||
| -rw-r--r-- | src/udev/udev-builtin-net_id.c | 18 | ||||
| -rw-r--r-- | src/udev/udev-ctrl.c | 1 | ||||
| -rw-r--r-- | src/udev/udev.pc.in | 1 |
5 files changed, 10 insertions, 12 deletions
diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in index 268dbb64d5..e5aae5ab6a 100644 --- a/src/libudev/libudev.pc.in +++ b/src/libudev/libudev.pc.in @@ -14,5 +14,4 @@ Name: libudev Description: Library to access udev device information Version: @UDEV_VERSION@ Libs: -L${libdir} -ludev - Cflags: -I${includedir} diff --git a/src/shared/label.c b/src/shared/label.c index e674241bfe..1e63266406 100644 --- a/src/shared/label.c +++ b/src/shared/label.c @@ -156,7 +156,6 @@ static int label_fix_selinux(const char *path, bool ignore_enoent, bool ignore_e if (r < 0) { /* Ignore ENOENT in some cases */ - if (ignore_enoent && errno == ENOENT) return 0; diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index ae32d2f104..4731a860b0 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -36,9 +36,9 @@ * b<number> -- BCMA bus core number * ccw<name> -- CCW bus group name * o<index> -- on-board device index number - * s<slot>[f<function>][d<dev_id>] -- hotplug slot index number + * s<slot>[f<function>][d<dev_port>] -- hotplug slot index number * x<MAC> -- MAC address - * [P<domain>]p<bus>s<slot>[f<function>][d<dev_id>] + * [P<domain>]p<bus>s<slot>[f<function>][d<dev_port>] * -- PCI geographical location * [P<domain>]p<bus>s<slot>[f<function>][u<port>][..][c<config>][i<interface>] * -- USB port number chain @@ -169,7 +169,7 @@ static bool is_pci_multifunction(struct udev_device *dev) { static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { struct udev *udev = udev_device_get_udev(names->pcidev); - unsigned domain, bus, slot, func, dev_id = 0; + unsigned domain, bus, slot, func, dev_port = 0; size_t l; char *s; const char *attr; @@ -183,9 +183,9 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { return -ENOENT; /* kernel provided multi-device index */ - attr = udev_device_get_sysattr_value(dev, "dev_id"); + attr = udev_device_get_sysattr_value(dev, "dev_port"); if (attr) - dev_id = strtol(attr, NULL, 16); + dev_port = strtol(attr, NULL, 10); /* compose a name based on the raw kernel's PCI bus, slot numbers */ s = names->pci_path; @@ -195,8 +195,8 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { l = strpcpyf(&s, l, "p%ds%d", bus, slot); if (func > 0 || is_pci_multifunction(names->pcidev)) l = strpcpyf(&s, l, "f%d", func); - if (dev_id > 0) - l = strpcpyf(&s, l, "d%d", dev_id); + if (dev_port > 0) + l = strpcpyf(&s, l, "d%d", dev_port); if (l == 0) names->pci_path[0] = '\0'; @@ -245,8 +245,8 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { l = strpcpyf(&s, l, "s%d", hotplug_slot); if (func > 0 || is_pci_multifunction(names->pcidev)) l = strpcpyf(&s, l, "f%d", func); - if (dev_id > 0) - l = strpcpyf(&s, l, "d%d", dev_id); + if (dev_port > 0) + l = strpcpyf(&s, l, "d%d", dev_port); if (l == 0) names->pci_path[0] = '\0'; } diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index 7986b2af27..2fdf4561a9 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -176,6 +176,7 @@ int udev_ctrl_get_fd(struct udev_ctrl *uctrl) { static inline int accept4_fallback(int sockfd) { int fd; + /* This is racey, but what can we do without accept4? */ if ((fd = accept(sockfd, NULL, NULL)) >= 0) { fcntl(fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFD, FD_CLOEXEC); diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in index 4f6381eb7a..4a9d867b8d 100644 --- a/src/udev/udev.pc.in +++ b/src/udev/udev.pc.in @@ -4,4 +4,3 @@ Version: @UDEV_VERSION@ prefix=@prefix@ exec_prefix=@exec_prefix@ udevdir=@udevlibexecdir@ - |