chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: add and improve hashmap tests
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index f2fe5d5443a28eecd87ccf80c686aa7c315e2523..2213ad717cb97233cbc254be5a90217d18b00078 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-115,7
+115,7
@@
int manager_new(Manager **ret) {
return -ENOMEM;
}
return -ENOMEM;
}
- m->netdevs = hashmap_new(
string_hash_func, string_compare_func
);
+ m->netdevs = hashmap_new(
&string_hash_ops
);
if (!m->netdevs)
return -ENOMEM;
if (!m->netdevs)
return -ENOMEM;
@@
-146,8
+146,6
@@
void manager_free(Manager *m) {
udev_unref(m->udev);
sd_bus_unref(m->bus);
sd_event_source_unref(m->udev_event_source);
udev_unref(m->udev);
sd_bus_unref(m->bus);
sd_event_source_unref(m->udev_event_source);
- sd_event_source_unref(m->sigterm_event_source);
- sd_event_source_unref(m->sigint_event_source);
sd_event_unref(m->event);
while ((link = hashmap_first(m->links)))
sd_event_unref(m->event);
while ((link = hashmap_first(m->links)))
@@
-370,6
+368,10
@@
int manager_udev_listen(Manager *m) {
if (r < 0)
return r;
if (r < 0)
return r;
+ r = sd_event_source_set_name(m->udev_event_source, "networkd-udev");
+ if (r < 0)
+ return r;
+
return 0;
}
return 0;
}
@@
-483,15
+485,15
@@
int manager_save(Manager *m) {
assert(m->state_file);
/* We add all NTP and DNS server to a set, to filter out duplicates */
assert(m->state_file);
/* We add all NTP and DNS server to a set, to filter out duplicates */
- dns = set_new(
string_hash_func, string_compare_func
);
+ dns = set_new(
&string_hash_ops
);
if (!dns)
return -ENOMEM;
if (!dns)
return -ENOMEM;
- ntp = set_new(
string_hash_func, string_compare_func
);
+ ntp = set_new(
&string_hash_ops
);
if (!ntp)
return -ENOMEM;
if (!ntp)
return -ENOMEM;
- domains = set_new(
string_hash_func, string_compare_func
);
+ domains = set_new(
&string_hash_ops
);
if (!domains)
return -ENOMEM;
if (!domains)
return -ENOMEM;