Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
440be4c8
Commit
440be4c8
authored
Dec 16, 1999
by
Michael Graff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move util.h to <isc/util.h>
parent
e8d9413b
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
30 additions
and
49 deletions
+30
-49
bin/named/client.c
bin/named/client.c
+1
-2
bin/named/query.c
bin/named/query.c
+1
-2
bin/named/server.c
bin/named/server.c
+1
-2
bin/tests/tkey_test.c
bin/tests/tkey_test.c
+1
-2
lib/dns/adb.c
lib/dns/adb.c
+1
-2
lib/dns/dbtable.c
lib/dns/dbtable.c
+2
-2
lib/dns/dispatch.c
lib/dns/dispatch.c
+1
-2
lib/dns/rbtdb.c
lib/dns/rbtdb.c
+1
-3
lib/dns/resolver.c
lib/dns/resolver.c
+1
-3
lib/dns/tcpmsg.c
lib/dns/tcpmsg.c
+1
-2
lib/dns/view.c
lib/dns/view.c
+1
-2
lib/dns/zone.c
lib/dns/zone.c
+2
-2
lib/dns/zt.c
lib/dns/zt.c
+1
-2
lib/isc/include/isc/Makefile.in
lib/isc/include/isc/Makefile.in
+4
-0
lib/isc/include/isc/util.h
lib/isc/include/isc/util.h
+0
-0
lib/isc/lex.c
lib/isc/lex.c
+1
-2
lib/isc/mem.c
lib/isc/mem.c
+1
-1
lib/isc/random.c
lib/isc/random.c
+1
-2
lib/isc/ratelimiter.c
lib/isc/ratelimiter.c
+1
-2
lib/isc/result.c
lib/isc/result.c
+1
-2
lib/isc/rwlock.c
lib/isc/rwlock.c
+1
-2
lib/isc/symtab.c
lib/isc/symtab.c
+1
-2
lib/isc/task.c
lib/isc/task.c
+1
-2
lib/isc/timer.c
lib/isc/timer.c
+1
-2
lib/isc/unix/app.c
lib/isc/unix/app.c
+1
-2
lib/isc/unix/socket.c
lib/isc/unix/socket.c
+1
-2
No files found.
bin/named/client.c
View file @
440be4c8
...
...
@@ -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, \
...
...
bin/named/query.c
View file @
440be4c8
...
...
@@ -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 & \
...
...
bin/named/server.c
View file @
440be4c8
...
...
@@ -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
;
...
...
bin/tests/tkey_test.c
View file @
440be4c8
...
...
@@ -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>
...
...
lib/dns/adb.c
View file @
440be4c8
...
...
@@ -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. */
...
...
lib/dns/dbtable.c
View file @
440be4c8
...
...
@@ -16,7 +16,7 @@
*/
/*
* $Id: dbtable.c,v 1.1
0
1999/1
0/09 02:49:16 halley
Exp $
* $Id: dbtable.c,v 1.1
1
1999/1
2/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>
...
...
lib/dns/dispatch.c
View file @
440be4c8
...
...
@@ -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
...
...
lib/dns/rbtdb.c
View file @
440be4c8
...
...
@@ -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
...
...
lib/dns/resolver.c
View file @
440be4c8
...
...
@@ -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, \
...
...
lib/dns/tcpmsg.c
View file @
440be4c8
...
...
@@ -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
...
...
lib/dns/view.c
View file @
440be4c8
...
...
@@ -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)
...
...
lib/dns/zone.c
View file @
440be4c8
...
...
@@ -15,13 +15,12 @@
* SOFTWARE.
*/
/* $Id: zone.c,v 1.4
6
1999/12/16
01
:2
3
:1
5 marka
Exp $ */
/* $Id: zone.c,v 1.4
7
1999/12/16
22
:2
4
:1
9 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>
...
...
lib/dns/zt.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/include/isc/Makefile.in
View file @
440be4c8
...
...
@@ -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
\
...
...
lib/isc/util.h
→
lib/isc/
include/isc/
util.h
View file @
440be4c8
File moved
lib/isc/lex.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/mem.c
View file @
440be4c8
...
...
@@ -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)
...
...
lib/isc/random.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/ratelimiter.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/result.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/rwlock.c
View file @
440be4c8
...
...
@@ -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 && \
...
...
lib/isc/symtab.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/task.c
View file @
440be4c8
...
...
@@ -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", \
...
...
lib/isc/timer.c
View file @
440be4c8
...
...
@@ -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))
...
...
lib/isc/unix/app.c
View file @
440be4c8
...
...
@@ -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
;
...
...
lib/isc/unix/socket.c
View file @
440be4c8
...
...
@@ -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,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment