From decd94f2a81d859f87fcc4fd63765bde775da1c7 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 25 May 2007 12:20:18 +0000 Subject: [PATCH] fixup lock code. git-svn-id: file:///svn/unbound/trunk@340 be551aaa-1e26-0410-a405-d3ace91eadb9 --- services/cache/dns.c | 12 ++++++------ services/cache/rrset.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/cache/dns.c b/services/cache/dns.c index bf10c3dcf..d82df4a82 100644 --- a/services/cache/dns.c +++ b/services/cache/dns.c @@ -174,19 +174,19 @@ find_add_addrs(struct module_env* env, uint16_t qclass, struct region* region, ns->namelen, LDNS_RR_TYPE_A, qclass, 0, now, 0); if(akey) { if(!add_a(akey, dp, region)) { - lock_rw_unlock(akey->entry.lock); + lock_rw_unlock(&akey->entry.lock); return 0; } - lock_rw_unlock(akey->entry.lock); + lock_rw_unlock(&akey->entry.lock); } akey = rrset_cache_lookup(env->rrset_cache, ns->name, ns->namelen, LDNS_RR_TYPE_AAAA, qclass, 0, now, 0); if(akey) { if(!add_aaaa(akey, dp, region)) { - lock_rw_unlock(akey->entry.lock); + lock_rw_unlock(&akey->entry.lock); return 0; } - lock_rw_unlock(akey->entry.lock); + lock_rw_unlock(&akey->entry.lock); } } return 1; @@ -210,7 +210,7 @@ dns_cache_find_delegation(struct module_env* env, uint8_t* qname, /* got the NS key, create delegation point */ dp = delegpt_create(region); if(!dp || !delegpt_set_name(dp, region, nskey->rk.dname)) { - lock_rw_unlock(nskey->entry.lock); + lock_rw_unlock(&nskey->entry.lock); log_err("find_delegation: out of memory"); return NULL; } @@ -222,7 +222,7 @@ dns_cache_find_delegation(struct module_env* env, uint8_t* qname, log_err("find_delegation: addns out of memory"); } /* find and add A entries */ - lock_rw_unlock(nskey->entry.lock); /* first unlock before next lookup*/ + lock_rw_unlock(&nskey->entry.lock); /* first unlock before next lookup*/ if(!find_add_addrs(env, qclass, region, dp, now)) log_err("find_delegation: addrs out of memory"); log_info("dns_cache_find_delegation returns delegpt"); diff --git a/services/cache/rrset.c b/services/cache/rrset.c index cf87bfe77..6b0dfb44e 100644 --- a/services/cache/rrset.c +++ b/services/cache/rrset.c @@ -198,7 +198,7 @@ rrset_cache_lookup(struct rrset_cache* r, uint8_t* qname, size_t qnamelen, struct packed_rrset_data* data = (struct packed_rrset_data*)e->data; if(timenow > data->ttl) { - lock_rw_unlock(e->lock); + lock_rw_unlock(&e->lock); return NULL; } /* we're done */ -- 2.47.2