Commit 440be4c8 authored by Michael Graff's avatar Michael Graff

move util.h to <isc/util.h>

parent e8d9413b
......@@ -23,6 +23,7 @@
#include <isc/result.h>
#include <isc/task.h>
#include <isc/timer.h>
#include <isc/util.h>
#include <dns/aml.h>
#include <dns/dispatch.h>
......@@ -41,8 +42,6 @@
#include <named/update.h>
#include <named/notify.h>
#include "../../isc/util.h" /* XXX */
#define NS_CLIENT_TRACE
#ifdef NS_CLIENT_TRACE
#define CTRACE(m) isc_log_write(ns_g_lctx, \
......
......@@ -26,6 +26,7 @@
#include <isc/timer.h>
#include <isc/event.h>
#include <isc/log.h>
#include <isc/util.h>
#include <dns/a6.h>
#include <dns/aml.h>
......@@ -52,8 +53,6 @@
#include <named/xfrout.h>
#include <named/log.h>
#include "../../isc/util.h" /* XXX */
#define PARTIALANSWER(c) (((c)->query.attributes & \
NS_QUERYATTR_PARTIALANSWER) != 0)
#define USECACHE(c) (((c)->query.attributes & \
......
......@@ -34,6 +34,7 @@
#include <isc/timer.h>
#include <isc/app.h>
#include <isc/dir.h>
#include <isc/util.h>
#include <dns/cache.h>
#include <dns/confparser.h>
......@@ -62,8 +63,6 @@
#include <named/rootns.h>
#include <named/server.h>
#include "../../isc/util.h" /* XXXRTH */
typedef struct {
isc_mem_t * mctx;
dns_viewlist_t viewlist;
......
......@@ -36,8 +36,7 @@
#include <isc/net.h>
#include <isc/socket.h>
#include <isc/log.h>
#include "../../isc/util.h" /* XXX Naughty. */
#include <isc/util.h>
#include <dns/types.h>
#include <dns/result.h>
......
......@@ -44,6 +44,7 @@
#include <isc/mutexblock.h>
#include <isc/random.h>
#include <isc/timer.h>
#include <isc/util.h>
#include <dns/a6.h>
#include <dns/adb.h>
......@@ -58,8 +59,6 @@
#include <dns/types.h>
#include <dns/view.h>
#include "../isc/util.h"
#define DNS_ADB_MAGIC 0x44616462 /* Dadb. */
#define DNS_ADB_VALID(x) ISC_MAGIC_VALID(x, DNS_ADB_MAGIC)
#define DNS_ADBNAME_MAGIC 0x6164624e /* adbN. */
......
......@@ -16,7 +16,7 @@
*/
/*
* $Id: dbtable.c,v 1.10 1999/10/09 02:49:16 halley Exp $
* $Id: dbtable.c,v 1.11 1999/12/16 22:24:17 explorer Exp $
*/
/*
......@@ -27,7 +27,7 @@
#include <isc/assertions.h>
#include <isc/rwlock.h>
#include "../isc/util.h"
#include <isc/util.h>
#include <dns/dbtable.h>
#include <dns/db.h>
......
......@@ -28,6 +28,7 @@
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/socket.h>
#include <isc/util.h>
#include <dns/events.h>
#include <dns/types.h>
......@@ -36,8 +37,6 @@
#include <dns/message.h>
#include <dns/tcpmsg.h>
#include "../isc/util.h"
#ifdef DISPATCH_DEBUG
#define XDEBUG(x) printf x
#else
......
......@@ -29,6 +29,7 @@
#include <isc/error.h>
#include <isc/mutex.h>
#include <isc/rwlock.h>
#include <isc/util.h>
#include <dns/types.h>
#include <dns/name.h>
......@@ -49,9 +50,6 @@
#include "rbtdb.h"
#endif
/* Lame. Move util.h to <isc/util.h> */
#include "../isc/util.h"
#ifdef DNS_RBTDB_VERSION64
#define RBTDB_MAGIC 0x52424438U /* RBD8. */
#else
......
......@@ -26,6 +26,7 @@
#include <isc/event.h>
#include <isc/task.h>
#include <isc/stdtime.h>
#include <isc/util.h>
#include <dns/types.h>
#include <dns/adb.h>
......@@ -43,11 +44,8 @@
#include <dns/tsig.h>
#include <dns/view.h>
#include <dns/log.h>
#include <dst/dst.h>
#include "../isc/util.h" /* XXX */
#define DNS_RESOLVER_TRACE
#ifdef DNS_RESOLVER_TRACE
#define RTRACE(m) isc_log_write(dns_lctx, \
......
......@@ -27,14 +27,13 @@
#include <isc/error.h>
#include <isc/mem.h>
#include <isc/socket.h>
#include <isc/util.h>
#include <dns/events.h>
#include <dns/types.h>
#include <dns/result.h>
#include <dns/tcpmsg.h>
#include "../isc/util.h"
#ifdef TCPMSG_DEBUG
#define XDEBUG(x) printf x
#else
......
......@@ -24,6 +24,7 @@
#include <isc/mem.h>
#include <isc/assertions.h>
#include <isc/error.h>
#include <isc/util.h>
#include <dns/types.h>
#include <dns/adb.h>
......@@ -37,8 +38,6 @@
#include <dns/resolver.h>
#include <dns/view.h>
#include "../isc/util.h" /* XXXRTH */
#define RESSHUTDOWN(v) (((v)->attributes & DNS_VIEWATTR_RESSHUTDOWN) != 0)
#define ADBSHUTDOWN(v) (((v)->attributes & DNS_VIEWATTR_ADBSHUTDOWN) != 0)
......
......@@ -15,13 +15,12 @@
* SOFTWARE.
*/
/* $Id: zone.c,v 1.46 1999/12/16 01:23:15 marka Exp $ */
/* $Id: zone.c,v 1.47 1999/12/16 22:24:19 explorer Exp $ */
#include <config.h>
#include <string.h>
#include <../isc/util.h> /* XXX MPA */
#include <isc/assertions.h>
#include <isc/error.h>
#include <isc/magic.h>
......@@ -30,6 +29,7 @@
#include <isc/serial.h>
#include <isc/taskpool.h>
#include <isc/timer.h>
#include <isc/util.h>
#include <dns/confparser.h>
#include <dns/db.h>
......
......@@ -21,11 +21,10 @@
#include <isc/magic.h>
#include <isc/rwlock.h>
#include <isc/result.h>
#include <isc/util.h>
#include <dns/zt.h>
#include "../isc/util.h" /* XXXRTH */
struct dns_zt {
/* Unlocked. */
unsigned int magic;
......
......@@ -19,6 +19,10 @@ top_srcdir = @top_srcdir@
@BIND9_VERSION@
#
# Only list headers that are to be installed! Things like util.h, which
# consists purely of private helper macros, should not be here.
#
HEADERS = assertions.h base64.h boolean.h buffer.h bufferlist.h \
commandline.h error.h event.h eventclass.h \
heap.h int.h interfaceiter.h lang.h lex.h lfsr.h lib.h \
......
......@@ -28,8 +28,7 @@
#include <isc/boolean.h>
#include <isc/error.h>
#include <isc/lex.h>
#include "util.h"
#include <isc/util.h>
typedef struct inputsource {
isc_result_t result;
......
......@@ -30,7 +30,7 @@
#ifndef ISC_SINGLETHREADED
#include <isc/mutex.h>
#include "util.h"
#include <isc/util.h>
#else
#define LOCK(l)
#define UNLOCK(l)
......
......@@ -24,8 +24,7 @@
#include <isc/mutex.h>
#include <isc/once.h>
#include <isc/random.h>
#include "util.h"
#include <isc/util.h>
static isc_once_t once = ISC_ONCE_INIT;
static isc_mutex_t rand_lock;
......
......@@ -21,8 +21,7 @@
#include <isc/boolean.h>
#include <isc/error.h>
#include <isc/ratelimiter.h>
#include "util.h"
#include <isc/util.h>
struct isc_ratelimiter {
isc_mem_t * mctx;
......
......@@ -28,8 +28,7 @@
#include <isc/once.h>
#include <isc/msgcat.h>
#include <isc/lib.h>
#include "util.h"
#include <isc/util.h>
typedef struct resulttable {
unsigned int base;
......
......@@ -23,8 +23,7 @@
#include <isc/error.h>
#include <isc/boolean.h>
#include <isc/rwlock.h>
#include "util.h"
#include <isc/util.h>
#define RWLOCK_MAGIC 0x52574C6BU /* RWLk. */
#define VALID_RWLOCK(rwl) ((rwl) != NULL && \
......
......@@ -24,8 +24,7 @@
#include <isc/assertions.h>
#include <isc/list.h>
#include <isc/symtab.h>
#include "util.h"
#include <isc/util.h>
typedef struct elt {
char * key;
......
......@@ -34,8 +34,7 @@
#include <isc/error.h>
#include <isc/event.h>
#include <isc/task.h>
#include "util.h"
#include <isc/util.h>
#ifdef ISC_TASK_TRACE
#define XTRACE(m) printf("task %p thread %lu: %s\n", \
......
......@@ -27,8 +27,7 @@
#include <isc/condition.h>
#include <isc/heap.h>
#include <isc/timer.h>
#include "util.h"
#include <isc/util.h>
#ifdef ISC_TIMER_TRACE
#define XTRACE(s) printf("%s\n", (s))
......
......@@ -33,8 +33,7 @@
#include <isc/boolean.h>
#include <isc/mutex.h>
#include <isc/event.h>
#include "../util.h" /* XXX */
#include <isc/util.h>
static isc_eventlist_t on_run;
static isc_mutex_t lock;
......
......@@ -39,8 +39,7 @@
#include <isc/region.h>
#include <isc/socket.h>
#include <isc/thread.h>
#include "util.h"
#include <isc/util.h>
/*
* Some systems define the socket length argument as an int, some as size_t,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment