resolve conflicts

1 files changed, 20 insertions, 20 deletions

diff --git a/usr.sbin/bind/lib/isc/string.c b/usr.sbin/bind/lib/isc/string.c
index 50a4680fd15..1dc97243f8d 100644
--- a/usr.sbin/bind/lib/isc/string.c
+++ b/usr.sbin/bind/lib/isc/string.c
@@ -1,21 +1,21 @@
 /*
- * Copyright (C) 1999-2001  Internet Software Consortium.
+ * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $ISC: string.c,v 1.6 2001/01/09 21:56:30 bwelling Exp $ */
+/* $ISC: string.c,v 1.6.164.4 2004/03/16 05:50:24 marka Exp $ */
 
 #include <config.h>
 
@@ -111,23 +111,23 @@ isc_string_separate(char **stringp, const char *delim) {
 }
 
 size_t
-strlcpy(char *dst, const char *src, size_t size)
+isc_string_strlcpy(char *dst, const char *src, size_t size)
 {
 	char *d = dst;
 	const char *s = src;
 	size_t n = size;
 
 	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
+	if (n != 0U && --n != 0U) {
 		do {
 			if ((*d++ = *s++) == 0)
 				break;
-		} while (--n != 0);
+		} while (--n != 0U);
 	}
 
 	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (size != 0)
+	if (n == 0U) {
+		if (size != 0U)
 			*d = '\0';		/* NUL-terminate dst */
 		while (*s++)
 			;
@@ -135,9 +135,9 @@ strlcpy(char *dst, const char *src, size_t size)
 
 	return(s - src - 1);	/* count does not include NUL */
 }
- 
+
 size_t
-strlcat(char *dst, const char *src, size_t size)
+isc_string_strlcat(char *dst, const char *src, size_t size)
 {
 	char *d = dst;
 	const char *s = src;
@@ -145,15 +145,15 @@ strlcat(char *dst, const char *src, size_t size)
 	size_t dlen;
 
 	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
+	while (n-- != 0U && *d != '\0')
 		d++;
 	dlen = d - dst;
 	n = size - dlen;
 
-	if (n == 0)
+	if (n == 0U)
 		return(dlen + strlen(s));
 	while (*s != '\0') {
-		if (n != 1) {
+		if (n != 1U) {
 			*d++ = *s;
 			n--;
 		}