chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: limit caps for bus proxyd and driverd services
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index 1b5837e42ca4e029681aa8372b7b68d95b6a39b0..c48c0180ad074b8de7e03dcc458239c0c355da6b 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-157,48
+157,42
@@
static int manager_process_link(Manager *m, struct udev_device *device) {
}
int manager_udev_enumerate_links(Manager *m) {
}
int manager_udev_enumerate_links(Manager *m) {
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_list_entry *item = NULL, *first = NULL;
- struct udev_enumerate *e;
int r;
assert(m);
e = udev_enumerate_new(m->udev);
int r;
assert(m);
e = udev_enumerate_new(m->udev);
- if (!e) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!e)
+ return -ENOMEM;
r = udev_enumerate_add_match_subsystem(e, "net");
if (r < 0)
r = udev_enumerate_add_match_subsystem(e, "net");
if (r < 0)
- goto finish;
+ return r;
+
+ r = udev_enumerate_add_match_is_initialized(e);
+ if (r < 0)
+ return r;
r = udev_enumerate_scan_devices(e);
if (r < 0)
r = udev_enumerate_scan_devices(e);
if (r < 0)
-
goto finish
;
+
return r
;
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
-
struct udev_device *d
;
+
_cleanup_udev_device_unref_ struct udev_device *d = NULL
;
int k;
d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
int k;
d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
- if (!d) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!d)
+ return -ENOMEM;
k = manager_process_link(m, d);
k = manager_process_link(m, d);
- udev_device_unref(d);
-
if (k < 0)
r = k;
}
if (k < 0)
r = k;
}
-finish:
- if (e)
- udev_enumerate_unref(e);
-
return r;
}
return r;
}
@@
-243,7
+237,6
@@
int manager_udev_listen(Manager *m) {
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link;
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link;
- unsigned flags;
int r, ifindex;
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
int r, ifindex;
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
@@
-254,11
+247,7
@@
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
if (!link)
return 0;
if (!link)
return 0;
- r = sd_rtnl_message_link_get_flags(message, &flags);
- if (r < 0)
- return 0;
-
- r = link_update_flags(link, flags);
+ r = link_update(link, message);
if (r < 0)
return 0;
if (r < 0)
return 0;