diff options
Diffstat (limited to 'contrib/bind/include/isc')
| -rw-r--r-- | contrib/bind/include/isc/assertions.h | 8 | ||||
| -rw-r--r-- | contrib/bind/include/isc/ctl.h | 11 | ||||
| -rw-r--r-- | contrib/bind/include/isc/eventlib.h | 4 | ||||
| -rw-r--r-- | contrib/bind/include/isc/irpmarshall.h | 5 | ||||
| -rw-r--r-- | contrib/bind/include/isc/logging.h | 9 | ||||
| -rw-r--r-- | contrib/bind/include/isc/memcluster.h | 2 | ||||
| -rw-r--r-- | contrib/bind/include/isc/misc.h | 10 |
7 files changed, 36 insertions, 13 deletions
diff --git a/contrib/bind/include/isc/assertions.h b/contrib/bind/include/isc/assertions.h index fdce88290256..0964f63c187f 100644 --- a/contrib/bind/include/isc/assertions.h +++ b/contrib/bind/include/isc/assertions.h @@ -16,7 +16,7 @@ */ /* - * $Id: assertions.h,v 8.3 2000/07/17 07:53:59 vixie Exp $ + * $Id: assertions.h,v 8.4 2001/05/29 05:47:07 marka Exp $ */ #ifndef ASSERTIONS_H @@ -26,12 +26,12 @@ typedef enum { assert_require, assert_ensure, assert_insist, assert_invariant } assertion_type; -typedef void (*assertion_failure_callback)(char *, int, assertion_type, char *, - int); +typedef void (*assertion_failure_callback)(const char *, int, assertion_type, + const char *, int); extern assertion_failure_callback __assertion_failed; void set_assertion_failure_callback(assertion_failure_callback f); -char *assertion_type_to_text(assertion_type type); +const char *assertion_type_to_text(assertion_type type); #ifdef CHECK_ALL #define CHECK_REQUIRE 1 diff --git a/contrib/bind/include/isc/ctl.h b/contrib/bind/include/isc/ctl.h index 3c6e565ff9e7..008e7a62e753 100644 --- a/contrib/bind/include/isc/ctl.h +++ b/contrib/bind/include/isc/ctl.h @@ -19,7 +19,7 @@ */ /* - * $Id: ctl.h,v 8.9 1999/08/08 20:16:45 vixie Exp $ + * $Id: ctl.h,v 8.11 2001/08/10 02:40:49 marka Exp $ */ #include <sys/types.h> @@ -46,7 +46,7 @@ typedef void (*ctl_logfunc)(enum ctl_severity, const char *fmt, ...); typedef void (*ctl_verbfunc)(struct ctl_sctx *, struct ctl_sess *, const struct ctl_verb *, const char *rest, - u_int respflags, void *respctx, void *uctx); + u_int respflags, const void *respctx, void *uctx); typedef void (*ctl_srvrdone)(struct ctl_sctx *, struct ctl_sess *, void *); @@ -62,7 +62,12 @@ struct ctl_verb { #define ctl_logger __ctl_logger +#ifdef __GNUC__ +void ctl_logger(enum ctl_severity, const char *, ...) + __attribute__((__format__(__printf__, 2, 3))); +#else void ctl_logger(enum ctl_severity, const char *, ...); +#endif /* Client symbols. */ @@ -94,7 +99,7 @@ struct ctl_sctx * ctl_server(evContext, const struct sockaddr *, size_t, ctl_logfunc, void *); void ctl_endserver(struct ctl_sctx *); void ctl_response(struct ctl_sess *, u_int, - const char *, u_int, void *, + const char *, u_int, const void *, ctl_srvrdone, void *, const char *, size_t); void ctl_sendhelp(struct ctl_sess *, u_int); diff --git a/contrib/bind/include/isc/eventlib.h b/contrib/bind/include/isc/eventlib.h index 6b9b077f5a93..5b98516f0f7f 100644 --- a/contrib/bind/include/isc/eventlib.h +++ b/contrib/bind/include/isc/eventlib.h @@ -18,7 +18,7 @@ /* eventlib.h - exported interfaces for eventlib * vix 09sep95 [initial] * - * $Id: eventlib.h,v 1.22 1999/08/18 22:09:04 vixie Exp $ + * $Id: eventlib.h,v 1.23 2001/05/29 05:47:09 marka Exp $ */ #ifndef _EVENTLIB_H @@ -106,7 +106,7 @@ int evHighestFD __P((evContext ctx)); int evListen __P((evContext ctx, int fd, int maxconn, evConnFunc func, void *uap, evConnID *id)); -int evConnect __P((evContext ctx, int fd, void *ra, int ralen, +int evConnect __P((evContext ctx, int fd, const void *ra, int ralen, evConnFunc func, void *uap, evConnID *id)); int evCancelConn __P((evContext ctx, evConnID id)); int evHold __P((evContext, evConnID)); diff --git a/contrib/bind/include/isc/irpmarshall.h b/contrib/bind/include/isc/irpmarshall.h index d8afe325b99e..30cef41109bc 100644 --- a/contrib/bind/include/isc/irpmarshall.h +++ b/contrib/bind/include/isc/irpmarshall.h @@ -16,7 +16,7 @@ */ /* - * $Id: irpmarshall.h,v 8.1 1999/01/18 07:46:47 vixie Exp $ + * $Id: irpmarshall.h,v 8.2 2001/05/29 05:47:10 marka Exp $ */ #ifndef _IRPMARSHALL_H_INCLUDED @@ -57,7 +57,8 @@ int irp_marshall_ho(struct hostent *ho, char **buffer, size_t *len); int irp_unmarshall_ho(struct hostent *ho, char *buffer); int irp_marshall_ng(const char *host, const char *user, const char *domain, char **buffer, size_t *len); -int irp_unmarshall_ng(char **host, char **user, char **domain, char *buffer); +int irp_unmarshall_ng(const char **host, const char **user, + const char **domain, char *buffer); int irp_marshall_nw(struct nwent *ne, char **buffer, size_t *len); int irp_unmarshall_nw(struct nwent *ne, char *buffer); int irp_marshall_ne(struct netent *ne, char **buffer, size_t *len); diff --git a/contrib/bind/include/isc/logging.h b/contrib/bind/include/isc/logging.h index 3d3d3132a09e..6d6976f1a8ee 100644 --- a/contrib/bind/include/isc/logging.h +++ b/contrib/bind/include/isc/logging.h @@ -72,6 +72,7 @@ typedef struct log_channel *log_channel; #define log_dec_references __log_dec_references #define log_get_channel_type __log_get_channel_type #define log_free_channel __log_free_channel +#define log_close_debug_channels __log_close_debug_channels FILE * log_open_stream(log_channel); int log_close_stream(log_channel); @@ -81,7 +82,12 @@ int log_check_channel(log_context, int, log_channel); int log_check(log_context, int, int); void log_vwrite(log_context, int, int, const char *, va_list args); +#ifdef __GNUC__ +void log_write(log_context, int, int, const char *, ...) + __attribute__((__format__(__printf__, 4, 5))); +#else void log_write(log_context, int, int, const char *, ...); +#endif int log_new_context(int, char **, log_context *); void log_free_context(log_context); int log_add_channel(log_context, int, log_channel); @@ -89,7 +95,7 @@ int log_remove_channel(log_context, int, log_channel); int log_option(log_context, int, int); int log_category_is_active(log_context, int); log_channel log_new_syslog_channel(unsigned int, int, int); -log_channel log_new_file_channel(unsigned int, int, char *, +log_channel log_new_file_channel(unsigned int, int, const char *, FILE *, unsigned int, unsigned long); int log_set_file_owner(log_channel, uid_t, gid_t); @@ -98,5 +104,6 @@ int log_inc_references(log_channel); int log_dec_references(log_channel); log_channel_type log_get_channel_type(log_channel); int log_free_channel(log_channel); +void log_close_debug_channels(log_context); #endif /* !LOGGING_H */ diff --git a/contrib/bind/include/isc/memcluster.h b/contrib/bind/include/isc/memcluster.h index b6f4191fd5ca..bcf69b25b667 100644 --- a/contrib/bind/include/isc/memcluster.h +++ b/contrib/bind/include/isc/memcluster.h @@ -34,6 +34,7 @@ #endif /*MEMCLUSTER_RECORD*/ #endif /*MEMCLUSTER_DEBUG*/ #define memstats __memstats +#define memactive __memactive int meminit(size_t, size_t); void * __memget(size_t); @@ -43,5 +44,6 @@ void __memput_debug(void *, size_t, const char *, int); void * __memget_record(size_t, const char *, int); void __memput_record(void *, size_t, const char *, int); void memstats(FILE *); +int memactive(void); #endif /* MEMCLUSTER_H */ diff --git a/contrib/bind/include/isc/misc.h b/contrib/bind/include/isc/misc.h index 3a94d3f54223..4de1ceeb029b 100644 --- a/contrib/bind/include/isc/misc.h +++ b/contrib/bind/include/isc/misc.h @@ -16,16 +16,24 @@ */ /* - * $Id: misc.h,v 8.4 2000/12/23 08:14:52 vixie Exp $ + * $Id: misc.h,v 8.5 2001/06/18 06:40:43 marka Exp $ */ #ifndef _ISC_MISC_H #define _ISC_MISC_H +#include <stdio.h> + #define bitncmp __bitncmp /*#define isc_movefile __isc_movefile */ extern int bitncmp(const void *l, const void *r, int n); extern int isc_movefile(const char *, const char *); +extern int isc_gethexstring(unsigned char *, size_t, int, FILE *, + int *); +extern void isc_puthexstring(FILE *, const unsigned char *, size_t, + size_t, size_t, const char *); +extern void isc_tohex(const unsigned char *, size_t, char *); + #endif /*_ISC_MISC_H*/ |