resolve conflicts

1 files changed, 31 insertions, 10 deletions

diff --git a/usr.sbin/bind/lib/lwres/herror.c b/usr.sbin/bind/lib/lwres/herror.c
index f138408d49e..e837b01a3ba 100644
--- a/usr.sbin/bind/lib/lwres/herror.c
+++ b/usr.sbin/bind/lib/lwres/herror.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -48,10 +48,31 @@
  * SUCH DAMAGE.
  */
 
+/*! \file herror.c
+   lwres_herror() prints the string s on stderr followed by the string
+   generated by lwres_hstrerror() for the error code stored in the global
+   variable lwres_h_errno.
+
+   lwres_hstrerror() returns an appropriate string for the error code
+   gievn by err. The values of the error codes and messages are as
+   follows:
+
+\li   #NETDB_SUCCESS: Resolver Error 0 (no error)
+
+\li   #HOST_NOT_FOUND: Unknown host
+
+\li #TRY_AGAIN: Host name lookup failure
+
+\li   #NO_RECOVERY: Unknown server error
+
+\li   #NO_DATA: No address associated with name
+
+ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] =
-	"$ISC: herror.c,v 1.10.12.2 2004/03/06 08:15:31 marka Exp $";
+	"$ISC: herror.c,v 1.13.18.2 2005/04/29 00:17:18 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
@@ -63,22 +84,22 @@ static const char rcsid[] =
 
 LIBLWRES_EXTERNAL_DATA int	lwres_h_errno;
 
-/*
+/*!
  * these have never been declared in any header file so make them static
  */
 
 static const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/* 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/* 2 TRY_AGAIN */
-	"Unknown server error",			/* 3 NO_RECOVERY */
-	"No address associated with name",	/* 4 NO_ADDRESS */
+	"Resolver Error 0 (no error)",		/*%< 0 no error */
+	"Unknown host",				/*%< 1 HOST_NOT_FOUND */
+	"Host name lookup failure",		/*%< 2 TRY_AGAIN */
+	"Unknown server error",			/*%< 3 NO_RECOVERY */
+	"No address associated with name",	/*%< 4 NO_ADDRESS */
 };
 
 static int	h_nerr = { sizeof(h_errlist) / sizeof(h_errlist[0]) };
 
 
-/*
+/*!
  * herror --
  *	print the error indicated by the h_errno value.
  */
@@ -87,7 +108,7 @@ lwres_herror(const char *s) {
 	fprintf(stderr, "%s: %s\n", s, lwres_hstrerror(lwres_h_errno));
 }
 
-/*
+/*!
  * hstrerror --
  *	return the string associated with a given "host" errno value.
  */