Commit 78838d3e authored by Brian Wellington's avatar Brian Wellington
Browse files

8 space -> tab conversion

parent 4ae3a03b
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.130 2000/12/08 17:06:46 mws Exp $ */
/* $Id: dig.c,v 1.131 2000/12/11 19:15:44 bwelling Exp $ */
#include <config.h>
#include <stdlib.h>
......@@ -1028,7 +1028,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
sizeof((*lookup)->textname));
debug("looking up %s", (*lookup)->textname);
(*lookup)->trace_root = ISC_TF((*lookup)->trace ||
(*lookup)->ns_search_only);
(*lookup)->ns_search_only);
(*lookup)->nibble = nibble;
(*lookup)->rdtype = dns_rdatatype_ptr;
(*lookup)->rdtypeset = ISC_TRUE;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dighost.c,v 1.173 2000/12/11 03:28:52 gson Exp $ */
/* $Id: dighost.c,v 1.174 2000/12/11 19:15:45 bwelling Exp $ */
/*
* Notice to programmers: Do not use this code as an example of how to
......@@ -135,14 +135,14 @@ isc_uint32_t rr_limit = INT_MAX;
* Can I get rid of these using shutdown events? XXX
*/
#define LOCK_LOOKUP {\
debug("lock_lookup %s:%d", __FILE__, __LINE__);\
check_result(isc_mutex_lock((&lookup_lock)), "isc_mutex_lock");\
debug("success");\
debug("lock_lookup %s:%d", __FILE__, __LINE__);\
check_result(isc_mutex_lock((&lookup_lock)), "isc_mutex_lock");\
debug("success");\
}
#define UNLOCK_LOOKUP {\
debug("unlock_lookup %s:%d", __FILE__, __LINE__);\
check_result(isc_mutex_unlock((&lookup_lock)),\
"isc_mutex_unlock");\
debug("unlock_lookup %s:%d", __FILE__, __LINE__);\
check_result(isc_mutex_unlock((&lookup_lock)),\
"isc_mutex_unlock");\
}
static void
......@@ -164,7 +164,7 @@ next_token(char **stringp, const char *delim) {
break;
} while (*res == '\0');
return (res);
}
}
static int
count_dots(char *string) {
......@@ -428,7 +428,7 @@ clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers) {
looknew->dnssec = lookold->dnssec;
looknew->udpsize = lookold->udpsize;
looknew->recurse = lookold->recurse;
looknew->aaonly = lookold->aaonly;
looknew->aaonly = lookold->aaonly;
looknew->adflag = lookold->adflag;
looknew->cdflag = lookold->cdflag;
looknew->ns_search_only = lookold->ns_search_only;
......@@ -1037,7 +1037,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query,
if ((section == DNS_SECTION_ANSWER) &&
(query->lookup->trace || query->lookup->ns_search_only))
followup_lookup(msg, query, DNS_SECTION_AUTHORITY);
return;
return;
}
debug("following up %s", query->lookup->textname);
......@@ -1490,7 +1490,7 @@ setup_lookup(dig_lookup_t *lookup) {
optattr[optlist.used].value.base =
isc_buffer_base(wirebuf);
optattr[optlist.used].value.length =
isc_buffer_usedlength(wirebuf);
isc_buffer_usedlength(wirebuf);
optlist.used++;
dns_compress_invalidate(&cctx);
}
......@@ -2768,7 +2768,7 @@ destroy_libs(void) {
if (taskmgr != NULL) {
debug("freeing taskmgr");
isc_taskmgr_destroy(&taskmgr);
}
}
LOCK_LOOKUP;
REQUIRE(sockcount == 0);
REQUIRE(recvcount == 0);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nslookup.c,v 1.68 2000/12/08 18:25:54 mws Exp $ */
/* $Id: nslookup.c,v 1.69 2000/12/11 19:15:46 bwelling Exp $ */
#include <config.h>
......@@ -110,16 +110,16 @@ static const char *rtypetext[] = {
"md = ", /* 3 */
"mf = ", /* 4 */
"canonical name = ", /* 5 */
"soa = ", /* 6 */
"mb = ", /* 7 */
"mg = ", /* 8 */
"mr = ", /* 9 */
"rtype_10 = ", /* 10 */
"soa = ", /* 6 */
"mb = ", /* 7 */
"mg = ", /* 8 */
"mr = ", /* 9 */
"rtype_10 = ", /* 10 */
"protocol = ", /* 11 */
"name = ", /* 12 */
"hinfo = ", /* 13 */
"minfo = ", /* 14 */
"mail exchanger = ", /* 15 */
"mail exchanger = ", /* 15 */
"text = ", /* 16 */
"rp = ", /* 17 */
"afsdb = ", /* 18 */
......@@ -130,21 +130,21 @@ static const char *rtypetext[] = {
"nsap_ptr = ", /* 23 */
"signature = ", /* 24 */
"key = ", /* 25 */
"px = ", /* 26 */
"gpos = ", /* 27 */
"has AAAA address", /* 28 */
"loc = ", /* 29 */
"px = ", /* 26 */
"gpos = ", /* 27 */
"has AAAA address", /* 28 */
"loc = ", /* 29 */
"next = ", /* 30 */
"rtype_31 = ", /* 31 */
"rtype_32 = ", /* 32 */
"service = ", /* 33 */
"service = ", /* 33 */
"rtype_34 = ", /* 34 */
"naptr = ", /* 35 */
"kx = ", /* 36 */
"cert = ", /* 37 */
"v6 address = ", /* 38 */
"dname = ", /* 39 */
"rtype_40 = ", /* 40 */
"rtype_40 = ", /* 40 */
"optional = "}; /* 41 */
......
......@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-keygen.c,v 1.44 2000/11/07 20:10:14 bwelling Exp $ */
/* $Id: dnssec-keygen.c,v 1.45 2000/12/11 19:15:48 bwelling Exp $ */
#include <config.h>
......@@ -397,7 +397,7 @@ main(int argc, char **argv) {
dst_lib_destroy();
if (verbose > 10)
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx);
isc_mem_destroy(&mctx);
return (0);
}
......@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signkey.c,v 1.44 2000/12/07 20:15:44 marka Exp $ */
/* $Id: dnssec-signkey.c,v 1.45 2000/12/11 19:15:49 bwelling Exp $ */
#include <config.h>
......@@ -430,12 +430,12 @@ main(int argc, char *argv[]) {
dns_rdata_freestruct(&sig);
while (!ISC_LIST_EMPTY(sigrdatalist.rdata)) {
rdata = ISC_LIST_HEAD(sigrdatalist.rdata);
ISC_LIST_UNLINK(sigrdatalist.rdata, rdata, link);
isc_mem_put(mctx, rdata->data, BUFSIZE);
isc_mem_put(mctx, rdata, sizeof *rdata);
}
while (!ISC_LIST_EMPTY(sigrdatalist.rdata)) {
rdata = ISC_LIST_HEAD(sigrdatalist.rdata);
ISC_LIST_UNLINK(sigrdatalist.rdata, rdata, link);
isc_mem_put(mctx, rdata->data, BUFSIZE);
isc_mem_put(mctx, rdata, sizeof *rdata);
}
dns_db_detach(&db);
......@@ -448,7 +448,7 @@ main(int argc, char *argv[]) {
cleanup_logging(&log);
isc_mem_free(mctx, output);
isc_mem_free(mctx, output);
cleanup_entropy(&ectx);
dst_lib_destroy();
if (verbose > 10)
......
......@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signzone.c,v 1.118 2000/12/09 02:17:01 bwelling Exp $ */
/* $Id: dnssec-signzone.c,v 1.119 2000/12/11 19:15:50 bwelling Exp $ */
#include <config.h>
......@@ -489,14 +489,14 @@ hasnullkey(dns_rdataset_t *rdataset) {
fatal("could not convert KEY into internal format");
if (dst_key_isnullkey(key))
found = ISC_TRUE;
dst_key_free(&key);
dst_key_free(&key);
if (found == ISC_TRUE)
return (ISC_TRUE);
result = dns_rdataset_next(rdataset);
}
if (result != ISC_R_NOMORE)
fatal("failure looking for null keys");
return (ISC_FALSE);
result = dns_rdataset_next(rdataset);
}
if (result != ISC_R_NOMORE)
fatal("failure looking for null keys");
return (ISC_FALSE);
}
static void
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssectool.c,v 1.24 2000/11/27 22:19:37 gson Exp $ */
/* $Id: dnssectool.c,v 1.25 2000/12/11 19:15:51 bwelling Exp $ */
#include <config.h>
......@@ -133,8 +133,8 @@ setup_logging(int verbose, isc_mem_t *mctx, isc_log_t **logp) {
int level;
switch (verbose) {
case 0:
/*
case 0:
/*
* We want to see warnings about things like out-of-zone
* data in the master file even when not verbose.
*/
......@@ -245,7 +245,7 @@ kbdget(isc_entropysource_t *source, void *arg, isc_boolean_t blocking) {
if (result != ISC_R_SUCCESS)
return (result);
sample = isc_time_nanoseconds(&t);
sample = isc_time_nanoseconds(&t);
extra = c;
result = isc_entropy_addcallbacksample(source, sample, extra);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: interfacemgr.c,v 1.51 2000/09/26 18:26:18 gson Exp $ */
/* $Id: interfacemgr.c,v 1.52 2000/12/11 19:19:07 bwelling Exp $ */
#include <config.h>
......@@ -172,7 +172,7 @@ static isc_result_t
ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
const char *name, ns_interface_t **ifpret)
{
ns_interface_t *ifp;
ns_interface_t *ifp;
isc_result_t result;
REQUIRE(NS_INTERFACEMGR_VALID(mgr));
......@@ -419,13 +419,13 @@ ns_interface_detach(ns_interface_t **targetp) {
*/
static ns_interface_t *
find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) {
ns_interface_t *ifp;
for (ifp = ISC_LIST_HEAD(mgr->interfaces); ifp != NULL;
ns_interface_t *ifp;
for (ifp = ISC_LIST_HEAD(mgr->interfaces); ifp != NULL;
ifp = ISC_LIST_NEXT(ifp, link)) {
if (isc_sockaddr_equal(&ifp->addr, addr))
break;
}
return (ifp);
return (ifp);
}
/*
......@@ -433,8 +433,8 @@ find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) {
*/
static void
purge_old_interfaces(ns_interfacemgr_t *mgr) {
ns_interface_t *ifp, *next;
for (ifp = ISC_LIST_HEAD(mgr->interfaces); ifp != NULL; ifp = next) {
ns_interface_t *ifp, *next;
for (ifp = ISC_LIST_HEAD(mgr->interfaces); ifp != NULL; ifp = next) {
INSIST(NS_INTERFACE_VALID(ifp));
next = ISC_LIST_NEXT(ifp, link);
if (ifp->generation != mgr->generation) {
......@@ -681,11 +681,11 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) {
verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1),
"no IPv4 interfaces found");
/*
* Now go through the interface list and delete anything that
* does not have the current generation number. This is
* how we catch interfaces that go away or change their
* addresses.
/*
* Now go through the interface list and delete anything that
* does not have the current generation number. This is
* how we catch interfaces that go away or change their
* addresses.
*/
purge_old_interfaces(mgr);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: log.c,v 1.26 2000/11/25 01:33:11 marka Exp $ */
/* $Id: log.c,v 1.27 2000/12/11 19:19:08 bwelling Exp $ */
#include <config.h>
......@@ -113,10 +113,10 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) {
destination.file.versions = ISC_LOG_ROLLNEVER;
destination.file.maximum_size = 0;
result = isc_log_createchannel(lcfg, "default_debug",
ISC_LOG_TOFILE,
ISC_LOG_DYNAMIC,
&destination,
ISC_LOG_PRINTTIME|
ISC_LOG_TOFILE,
ISC_LOG_DYNAMIC,
&destination,
ISC_LOG_PRINTTIME|
ISC_LOG_DEBUGONLY);
if (result != ISC_R_SUCCESS)
goto cleanup;
......@@ -139,9 +139,9 @@ ns_log_setsafechannels(isc_logconfig_t *lcfg) {
if (! ns_g_logstderr) {
result = isc_log_createchannel(lcfg, "default_debug",
ISC_LOG_TONULL,
ISC_LOG_DYNAMIC,
NULL, 0);
ISC_LOG_TONULL,
ISC_LOG_DYNAMIC,
NULL, 0);
if (result != ISC_R_SUCCESS)
goto cleanup;
}
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwaddr.c,v 1.1 2000/11/15 23:56:20 bwelling Exp $ */
/* $Id: lwaddr.c,v 1.2 2000/12/11 19:19:09 bwelling Exp $ */
#include <config.h>
......@@ -53,14 +53,14 @@ isc_result_t
lwaddr_sockaddr_fromlwresaddr(isc_sockaddr_t *sa, lwres_addr_t *la,
in_port_t port)
{
isc_netaddr_t na;
isc_result_t result;
isc_netaddr_t na;
isc_result_t result;
result = lwaddr_netaddr_fromlwresaddr(&na, la);
if (result != ISC_R_SUCCESS)
return (result);
isc_sockaddr_fromnetaddr(sa, &na, port);
return (ISC_R_SUCCESS);
result = lwaddr_netaddr_fromlwresaddr(&na, la);
if (result != ISC_R_SUCCESS)
return (result);
isc_sockaddr_fromnetaddr(sa, &na, port);
return (ISC_R_SUCCESS);
}
/*
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwsearch.c,v 1.4 2000/10/28 00:09:11 bwelling Exp $ */
/* $Id: lwsearch.c,v 1.5 2000/12/11 19:19:10 bwelling Exp $ */
#include <isc/magic.h>
#include <isc/mem.h>
......@@ -30,8 +30,8 @@
#include <named/lwsearch.h>
#include <named/types.h>
#define LWSEARCHLIST_MAGIC ISC_MAGIC('L', 'W', 'S', 'L')
#define VALID_LWSEARCHLIST(l) ISC_MAGIC_VALID(l, LWSEARCHLIST_MAGIC)
#define LWSEARCHLIST_MAGIC ISC_MAGIC('L', 'W', 'S', 'L')
#define VALID_LWSEARCHLIST(l) ISC_MAGIC_VALID(l, LWSEARCHLIST_MAGIC)
isc_result_t
ns_lwsearchlist_create(isc_mem_t *mctx, ns_lwsearchlist_t **listp) {
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: notify.c,v 1.21 2000/11/28 03:17:48 marka Exp $ */
/* $Id: notify.c,v 1.22 2000/12/11 19:19:11 bwelling Exp $ */
#include <config.h>
......@@ -117,8 +117,8 @@
static void
respond(ns_client_t *client, isc_result_t result) {
dns_rcode_t rcode;
dns_message_t *message;
isc_result_t msg_result;
dns_message_t *message;
isc_result_t msg_result;
message = client->message;
rcode = dns_result_torcode(result);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.160 2000/12/07 20:15:46 marka Exp $ */
/* $Id: query.c,v 1.161 2000/12/11 19:19:12 bwelling Exp $ */
#include <config.h>
......@@ -70,13 +70,13 @@
#define CTRACE(m) isc_log_write(ns_g_lctx, \
NS_LOGCATEGORY_CLIENT, \
NS_LOGMODULE_QUERY, \
ISC_LOG_DEBUG(3), \
"client %p: %s", client, (m))
ISC_LOG_DEBUG(3), \
"client %p: %s", client, (m))
#define QTRACE(m) isc_log_write(ns_g_lctx, \
NS_LOGCATEGORY_GENERAL, \
NS_LOGMODULE_QUERY, \
ISC_LOG_DEBUG(3), \
"query %p: %s", query, (m))
ISC_LOG_DEBUG(3), \
"query %p: %s", query, (m))
#else
#define CTRACE(m) ((void)m)
#define QTRACE(m) ((void)m)
......@@ -2400,7 +2400,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
if (result == DNS_R_REFUSED)
QUERY_ERROR(DNS_R_REFUSED);
else
QUERY_ERROR(DNS_R_SERVFAIL);
QUERY_ERROR(DNS_R_SERVFAIL);
goto cleanup;
}
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: xfrout.c,v 1.83 2000/12/04 06:31:41 gson Exp $ */
/* $Id: xfrout.c,v 1.84 2000/12/11 19:19:14 bwelling Exp $ */
#include <config.h>
......@@ -1045,7 +1045,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
*/
if (DNS_SERIAL_GE(begin_serial, current_serial) ||
(client->attributes & NS_CLIENTATTR_TCP) == 0)
{
{
CHECK(soa_rrstream_create(mctx, db, ver, &stream));
goto have_stream;
}
......@@ -1607,7 +1607,7 @@ static void
xfrout_log1(ns_client_t *client, dns_name_t *zonename, int level,
const char *fmt, ...)
{
va_list ap;
va_list ap;
va_start(ap, fmt);
xfrout_logv(client, zonename, level, fmt, ap);
va_end(ap);
......@@ -1618,7 +1618,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename, int level,
*/
static void
xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...) {
va_list ap;
va_list ap;
va_start(ap, fmt);
xfrout_logv(xfr->client, xfr->qname, level, fmt, ap);
va_end(ap);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.76 2000/12/01 23:49:50 gson Exp $ */
/* $Id: zoneconf.c,v 1.77 2000/12/11 19:19:15 bwelling Exp $ */
#include <config.h>
......@@ -309,7 +309,7 @@ ns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
result = dns_c_ctx_getalsonotify(cctx, &iplist);
if (result == ISC_R_SUCCESS) {
result = dns_zone_setalsonotify(zone, iplist->ips,
iplist->nextidx);
iplist->nextidx);
dns_c_iplist_detach(&iplist);
if (result != ISC_R_SUCCESS)
return (result);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsupdate.c,v 1.72 2000/12/07 20:05:29 bwelling Exp $ */
/* $Id: nsupdate.c,v 1.73 2000/12/11 19:15:53 bwelling Exp $ */
#include <config.h>
......@@ -491,21 +491,21 @@ setup_system(void) {
static void
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) {
struct in_addr in4;
struct in6_addr in6;
struct in_addr in4;
struct in6_addr in6;
#if defined(HAVE_ADDRINFO) && defined(HAVE_GETADDRINFO)
struct addrinfo *res = NULL;
int result;
#else
struct hostent *he;
struct hostent *he;
#endif
ddebug("get_address()");
if (have_ipv6 && inet_pton(AF_INET6, host, &in6) == 1)
isc_sockaddr_fromin6(sockaddr, &in6, port);
else if (inet_pton(AF_INET, host, &in4) == 1)
isc_sockaddr_fromin(sockaddr, &in4, port);
else {
ddebug("get_address()");
if (have_ipv6 && inet_pton(AF_INET6, host, &in6) == 1)
isc_sockaddr_fromin6(sockaddr, &in6, port);
else if (inet_pton(AF_INET, host, &in4) == 1)
isc_sockaddr_fromin(sockaddr, &in4, port);
else {
#if defined(HAVE_ADDRINFO) && defined(HAVE_GETADDRINFO)
result = getaddrinfo(host, NULL, NULL, &res);
if (result != 0) {
......@@ -517,16 +517,16 @@ get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) {
isc_sockaddr_setport(sockaddr, port);
freeaddrinfo(res);
#else
he = gethostbyname(host);
if (he == NULL)
fatal("Couldn't look up your server host %s. errno=%d",
host, h_errno);
INSIST(he->h_addrtype == AF_INET);
isc_sockaddr_fromin(sockaddr,
(struct in_addr *)(he->h_addr_list[0]),
port);
he = gethostbyname(host);
if (he == NULL)
fatal("Couldn't look up your server host %s. errno=%d",
host, h_errno);
INSIST(he->h_addrtype == AF_INET);
isc_sockaddr_fromin(sockaddr,
(struct in_addr *)(he->h_addr_list[0]),
port);
#endif
}
}
}
static void
......@@ -1600,26 +1600,26 @@ getinput(isc_task_t *task, isc_event_t *event) {
int
main(int argc, char **argv) {
isc_result_t result;
isc_result_t result;
input = stdin;
isc_app_start();
parse_args(argc, argv);
parse_args(argc, argv);
setup_system();
setup_system();
result = isc_app_onrun(mctx, global_task, getinput, NULL);
check_result(result, "isc_app_onrun");
(void)isc_app_run();
cleanup();
cleanup();
isc_app_finish();
if (seenerror)
if (seenerror)
return (2);
else
return (0);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cache.c,v 1.30 2000/08/31 12:15:08 marka Exp $ */
/* $Id: cache.c,v 1.31 2000/12/11 19:24:03 bwelling Exp $ */