chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: when querying addresses of a container, use same code as nss-myhostname...
[elogind.git]
/
src
/
udev
/
udev-event.c
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index 2cab42bbc692ac0193234df4d7c48edea8e66609..5213a4abaa939b77ef559db847ba989d82a19f4d 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-776,13
+776,12
@@
static int rename_netif(struct udev_event *event)
return r;
}
return r;
}
-
int
udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigmask)
+
void
udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigmask)
{
struct udev_device *dev = event->dev;
{
struct udev_device *dev = event->dev;
- int err = 0;
if (udev_device_get_subsystem(dev) == NULL)
if (udev_device_get_subsystem(dev) == NULL)
- return
-1
;
+ return;
if (streq(udev_device_get_action(dev), "remove")) {
udev_device_read_db(dev, NULL);
if (streq(udev_device_get_action(dev), "remove")) {
udev_device_read_db(dev, NULL);
@@
-816,9
+815,10
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
event->name != NULL && !streq(event->name, udev_device_get_sysname(dev))) {
char syspath[UTIL_PATH_SIZE];
char *pos;
event->name != NULL && !streq(event->name, udev_device_get_sysname(dev))) {
char syspath[UTIL_PATH_SIZE];
char *pos;
+ int r;
-
er
r = rename_netif(event);
- if (
err =
= 0) {
+ r = rename_netif(event);
+ if (
r >
= 0) {
log_debug("renamed netif to '%s'", event->name);
/* remember old name */
log_debug("renamed netif to '%s'", event->name);
/* remember old name */
@@
-881,7
+881,6
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
udev_device_unref(event->dev_db);
event->dev_db = NULL;
}
udev_device_unref(event->dev_db);
event->dev_db = NULL;
}
- return err;
}
void udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
}
void udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)