diff --git a/lib/dns/name.c b/lib/dns/name.c index e74c0164eb..0ed0a04f49 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.c,v 1.126 2001/06/21 01:30:22 gson Exp $ */ +/* $Id: name.c,v 1.127 2001/06/28 21:34:11 gson Exp $ */ #include @@ -2854,13 +2854,7 @@ dns_name_split(dns_name_t *name, len = bitbytes; if (mod == 0) { - if ((void *)(name->ndata) == - prefix->buffer->base && - len > (unsigned int)(src - dst)) - memmove(dst, src, len); - else - memcpy(dst, src, len); - + memmove(dst, src, len); } else { /* * p is adjusted to point to the last byte of @@ -2974,16 +2968,8 @@ dns_name_split(dns_name_t *name, } else len = suffix->length - 2; - /* - * XXX DCL better way to decide memcpy vs memmove? - */ - if (len > 0) { - if ((dst <= src && dst + len > src) || - (src <= dst && src + len > dst)) - memmove(dst, src, len); - else - memcpy(dst, src, len); - } + if (len > 0) + memmove(dst, src, len); suffix->buffer->used = suffix->length; suffix->ndata = suffix->buffer->base;