From be4fec35a1f1c695a31aee40cbb3eaedb601e59a Mon Sep 17 00:00:00 2001 From: Yuri Schaeffer Date: Tue, 18 Sep 2012 14:52:37 +0000 Subject: [PATCH] Don't compare all these things when pointing to the same memory. git-svn-id: file:///svn/unbound/branches/edns-subnet@2763 be551aaa-1e26-0410-a405-d3ace91eadb9 --- services/mesh.c | 2 ++ util/data/msgreply.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/mesh.c b/services/mesh.c index c041b2584..072217f07 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -127,6 +127,8 @@ mesh_state_compare(const void* ap, const void* bp) struct mesh_state* a = (struct mesh_state*)ap; struct mesh_state* b = (struct mesh_state*)bp; + if(ap == bp) + return 0; if(a->s.is_priming && !b->s.is_priming) return -1; if(!a->s.is_priming && b->s.is_priming) diff --git a/util/data/msgreply.c b/util/data/msgreply.c index f87e0a8fe..ab653bc16 100644 --- a/util/data/msgreply.c +++ b/util/data/msgreply.c @@ -529,14 +529,13 @@ query_info_compare(void* m1, void* m2) struct query_info* msg2 = (struct query_info*)m2; int mc; /* from most different to least different for speed */ - if(m1 == m2) return 0; COMPARE_IT(msg1->qtype, msg2->qtype); if((mc = query_dname_compare(msg1->qname, msg2->qname)) != 0) return mc; log_assert(msg1->qname_len == msg2->qname_len); COMPARE_IT(msg1->qclass, msg2->qclass); /* If the reply has subnet and we expect subnet, whole option must - * match. Otherwise be lenient.*/ + * match. Otherwise be lenient. */ if(msg1->subnet_option && msg2->subnet_option) { COMPARE_IT(msg1->subnet_addr_fam, msg2->subnet_addr_fam); COMPARE_IT(msg1->subnet_source_mask, msg2->subnet_source_mask); @@ -544,7 +543,6 @@ query_info_compare(void* m1, void* m2) msg2->subnet_addr, INET6_SIZE)) != 0) return mc; } - return 0; #undef COMPARE_IT } -- 2.47.2