SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/netdev: split out netdev_attach_name_full()

Browse Source 
No functional change, preparation for later commits.
This commit is contained in:
Yu Watanabe
2024-10-30 03:07:32 +09:00
parent 99996d5f5e
commit 3252a1f274
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/netdev.c
+10 -4
View File
@@ -273,18 +273,17 @@ void netdev_drop(NetDev *netdev) {
netdev_detach(netdev);
}
int netdev_attach_name(NetDev *netdev, const char *name) {
static int netdev_attach_name_full(NetDev *netdev, const char *name, Hashmap **netdevs) {
int r;
assert(netdev);
assert(netdev->manager);
assert(name);
r = hashmap_ensure_put(&netdev->manager->netdevs, &string_hash_ops, name, netdev);
r = hashmap_ensure_put(netdevs, &string_hash_ops, name, netdev);
if (r == -ENOMEM)
return log_oom();
if (r == -EEXIST) {
NetDev *n = hashmap_get(netdev->manager->netdevs, name);
NetDev *n = hashmap_get(*netdevs, name);
assert(n);
if (!streq(netdev->filename, n->filename))
@@ -299,6 +298,13 @@ int netdev_attach_name(NetDev *netdev, const char *name) {
return 0;
}
int netdev_attach_name(NetDev *netdev, const char *name) {
assert(netdev);
assert(netdev->manager);
return netdev_attach_name_full(netdev, name, &netdev->manager->netdevs);
}
static int netdev_attach(NetDev *netdev) {
int r;