chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: store ifindex as int
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index 4d105248f02b128ad4af8657fcf07c7e26e5d235..223cb2a75aa5e7de77f8afaecc3c3dc51b0b3d1d 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-114,10
+114,6
@@
int manager_new(Manager **ret) {
return -ENOMEM;
}
return -ENOMEM;
}
- m->links = hashmap_new(uint64_hash_func, uint64_compare_func);
- if (!m->links)
- return -ENOMEM;
-
m->netdevs = hashmap_new(string_hash_func, string_compare_func);
if (!m->netdevs)
return -ENOMEM;
m->netdevs = hashmap_new(string_hash_func, string_compare_func);
if (!m->netdevs)
return -ENOMEM;
@@
-227,7
+223,7
@@
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
Link *link = NULL;
NetDev *netdev = NULL;
uint16_t type;
Link *link = NULL;
NetDev *netdev = NULL;
uint16_t type;
- char *name;
+ c
onst c
har *name;
int r, ifindex;
assert(rtnl);
int r, ifindex;
assert(rtnl);
@@
-467,7
+463,7
@@
finish:
return r;
}
return r;
}
-int manager_address_pool_acquire(Manager *m,
unsigned
family, unsigned prefixlen, union in_addr_union *found) {
+int manager_address_pool_acquire(Manager *m,
int
family, unsigned prefixlen, union in_addr_union *found) {
AddressPool *p;
int r;
AddressPool *p;
int r;