chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: avoid a null dereference
[elogind.git]
/
src
/
resolve
/
resolved-dns-zone.c
diff --git
a/src/resolve/resolved-dns-zone.c
b/src/resolve/resolved-dns-zone.c
index 370ecefd790b861fe75fd9d664ea0a5bb4f38cd2..a4c9b7d7afad6b1fb64d513c88bb486f5b611c47 100644
(file)
--- a/
src/resolve/resolved-dns-zone.c
+++ b/
src/resolve/resolved-dns-zone.c
@@
-126,11
+126,11
@@
static int dns_zone_init(DnsZone *z) {
assert(z);
assert(z);
- r = hashmap_ensure_allocated(&z->by_key,
dns_resource_key_hash_func, dns_resource_key_compare_func
);
+ r = hashmap_ensure_allocated(&z->by_key,
&dns_resource_key_hash_ops
);
if (r < 0)
return r;
if (r < 0)
return r;
- r = hashmap_ensure_allocated(&z->by_name,
dns_name_hash_func, dns_name_compare_func
);
+ r = hashmap_ensure_allocated(&z->by_name,
&dns_name_hash_ops
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-194,7
+194,7
@@
static int dns_zone_item_probe_start(DnsZoneItem *i) {
return r;
}
return r;
}
- r = set_ensure_allocated(&t->zone_items, NULL
, NULL
);
+ r = set_ensure_allocated(&t->zone_items, NULL);
if (r < 0)
goto gc;
if (r < 0)
goto gc;
@@
-570,7
+570,7
@@
static int dns_zone_item_verify(DnsZoneItem *i) {
i->state = DNS_ZONE_ITEM_VERIFYING;
r = dns_zone_item_probe_start(i);
if (r < 0) {
i->state = DNS_ZONE_ITEM_VERIFYING;
r = dns_zone_item_probe_start(i);
if (r < 0) {
- log_error
("Failed to start probing for verifying RR: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to start probing for verifying RR: %m"
);
i->state = DNS_ZONE_ITEM_ESTABLISHED;
return r;
}
i->state = DNS_ZONE_ITEM_ESTABLISHED;
return r;
}
@@
-580,7
+580,7
@@
static int dns_zone_item_verify(DnsZoneItem *i) {
int dns_zone_check_conflicts(DnsZone *zone, DnsResourceRecord *rr) {
DnsZoneItem *i, *first;
int dns_zone_check_conflicts(DnsZone *zone, DnsResourceRecord *rr) {
DnsZoneItem *i, *first;
- int c;
+ int c
= 0
;
assert(zone);
assert(rr);
assert(zone);
assert(rr);
@@
-614,7
+614,7
@@
int dns_zone_check_conflicts(DnsZone *zone, DnsResourceRecord *rr) {
int dns_zone_verify_conflicts(DnsZone *zone, DnsResourceKey *key) {
DnsZoneItem *i, *first;
int dns_zone_verify_conflicts(DnsZone *zone, DnsResourceKey *key) {
DnsZoneItem *i, *first;
- int c;
+ int c
= 0
;
assert(zone);
assert(zone);