From dfc595ff7a85cd29502eacbeb4306e2de0e69830 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 15 Nov 2000 20:35:13 +0000 Subject: [PATCH] Take care of a "variable might be used before set" warning. --- bin/named/sortlist.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/bin/named/sortlist.c b/bin/named/sortlist.c index fc0cc2a08e..5159759f8c 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.2 2000/11/15 18:12:37 gson Exp $ */ +/* $Id: sortlist.c,v 1.3 2000/11/15 20:35:13 tale Exp $ */ #include @@ -113,18 +113,25 @@ ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr, dns_addressorderfunc_t *orderp, void **argp) { - dns_addressorderfunc_t order; - switch (ns_sortlist_setup(sortlist_acl, client_addr, argp)) { + ns_sortlisttype_t sortlisttype; + + sortlisttype = ns_sortlist_setup(sortlist_acl, client_addr, argp); + + switch (sortlisttype) { case NS_SORTLISTTYPE_1ELEMENT: - order = ns_sortlist_addrorder1; + *orderp = ns_sortlist_addrorder1; break; case NS_SORTLISTTYPE_2ELEMENT: - order = ns_sortlist_addrorder2; + *orderp = ns_sortlist_addrorder2; break; case NS_SORTLISTTYPE_NONE: - order = NULL; + *orderp = NULL; + break; + default: + UNEXPECTED_ERROR(__FILE__, __LINE__, + "unexpected return from ns_sortlist_setup(): " + "%d", sortlisttype); break; } - *orderp = order; }