From eb23b7b59001bba7d562034bdec3808caa1daf60 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Wed, 15 Nov 2000 18:12:38 +0000
Subject: [PATCH] eliminated compiler warnings; renamed setup_sortlist() to
 ns_sortlist_setup() to conform to naming conventions

---
 bin/named/include/named/sortlist.h | 4 ++--
 bin/named/query.c                  | 9 ++++++---
 bin/named/sortlist.c               | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/named/include/named/sortlist.h b/bin/named/include/named/sortlist.h
index 076dae2c6c..f69f88db04 100644
--- a/bin/named/include/named/sortlist.h
+++ b/bin/named/include/named/sortlist.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sortlist.h,v 1.2 2000/11/15 02:47:29 gson Exp $ */
+/* $Id: sortlist.h,v 1.3 2000/11/15 18:12:38 gson Exp $ */
 
 #ifndef NAMED_SORTLIST_H
 #define NAMED_SORTLIST_H 1
@@ -40,7 +40,7 @@ typedef enum {
 } ns_sortlisttype_t;
 
 ns_sortlisttype_t
-setup_sortlist(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp);
+ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp);
 /*
  * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.
  *
diff --git a/bin/named/query.c b/bin/named/query.c
index 8ee675a1fc..1717f4e5fa 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.149 2000/11/14 03:30:53 gson Exp $ */
+/* $Id: query.c,v 1.150 2000/11/15 18:12:36 gson Exp $ */
 
 #include <config.h>
 
@@ -2247,11 +2247,11 @@ query_sortlist_order_1element(dns_rdata_t *rdata, void *arg) {
 static void
 setup_query_sortlist(ns_client_t *client) {
 	isc_netaddr_t netaddr;
-	dns_rdatasetorderfunc_t order;
+	dns_rdatasetorderfunc_t order = NULL;
 	void *order_arg = NULL;
 	
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
-	switch (setup_sortlist(client->view->sortlist,
+	switch (ns_sortlist_setup(client->view->sortlist,
 			       &netaddr, &order_arg)) {
 	case NS_SORTLISTTYPE_1ELEMENT:
 		order = query_sortlist_order_1element;
@@ -2262,6 +2262,9 @@ setup_query_sortlist(ns_client_t *client) {
 	case NS_SORTLISTTYPE_NONE:
 		order = NULL;
 		break;
+	default:
+		INSIST(0);
+		break;
 	}
 	dns_message_setsortorder(client->message, order, order_arg);
 }
diff --git a/bin/named/sortlist.c b/bin/named/sortlist.c
index ae33abae6f..fc0cc2a08e 100644
--- a/bin/named/sortlist.c
+++ b/bin/named/sortlist.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sortlist.c,v 1.1 2000/11/14 03:22:53 gson Exp $ */
+/* $Id: sortlist.c,v 1.2 2000/11/15 18:12:37 gson Exp $ */
 
 #include <config.h>
 
@@ -30,7 +30,7 @@
 #include <named/sortlist.h>
 
 ns_sortlisttype_t
-setup_sortlist(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp) {
+ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp) {
 	unsigned int i;
 
 	if (acl == NULL)
@@ -114,7 +114,7 @@ ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr,
 		       void **argp)
 {
 	dns_addressorderfunc_t order;
-	switch (setup_sortlist(sortlist_acl, client_addr, argp)) {
+	switch (ns_sortlist_setup(sortlist_acl, client_addr, argp)) {
 	case NS_SORTLISTTYPE_1ELEMENT:
 		order = ns_sortlist_addrorder1;
 		break;