From db6316a3523340d2ca2fb492fb6ddf9cf77e15f6 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 17 May 2024 23:56:19 +0000 Subject: [PATCH] remove prototypes with no matching function; ok florian@ --- usr.bin/dig/dig.h | 3 --- usr.bin/dig/lib/dns/dst_internal.h | 3 +-- usr.bin/dig/lib/dns/include/dns/compress.h | 22 +------------------- usr.bin/dig/lib/dns/include/dns/message.h | 21 ------------------- usr.bin/dig/lib/isc/include/isc/log.h | 24 +--------------------- 5 files changed, 3 insertions(+), 70 deletions(-) diff --git a/usr.bin/dig/dig.h b/usr.bin/dig/dig.h index 86e7ee65bd6..feed92369f1 100644 --- a/usr.bin/dig/dig.h +++ b/usr.bin/dig/dig.h @@ -288,9 +288,6 @@ start_lookup(void); void onrun_callback(isc_task_t *task, isc_event_t *event); -int -dhmain(int argc, char **argv); - void setup_libs(void); diff --git a/usr.bin/dig/lib/dns/dst_internal.h b/usr.bin/dig/lib/dns/dst_internal.h index aee3c62abab..a110676e5e2 100644 --- a/usr.bin/dig/lib/dns/dst_internal.h +++ b/usr.bin/dig/lib/dns/dst_internal.h @@ -31,7 +31,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dst_internal.h,v 1.12 2020/09/15 08:15:59 deraadt Exp $ */ +/* $Id: dst_internal.h,v 1.13 2024/05/17 23:56:19 jsg Exp $ */ #ifndef DST_DST_INTERNAL_H #define DST_DST_INTERNAL_H 1 @@ -133,7 +133,6 @@ isc_result_t dst__hmacsha384_init(struct dst_func **funcp); isc_result_t dst__hmacsha512_init(struct dst_func **funcp); isc_result_t dst__opensslrsa_init(struct dst_func **funcp, unsigned char algorithm); -isc_result_t dst__opensslecdsa_init(struct dst_func **funcp); /*% * Destructors diff --git a/usr.bin/dig/lib/dns/include/dns/compress.h b/usr.bin/dig/lib/dns/include/dns/compress.h index bb00c251e43..bab8d529788 100644 --- a/usr.bin/dig/lib/dns/include/dns/compress.h +++ b/usr.bin/dig/lib/dns/include/dns/compress.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: compress.h,v 1.5 2020/09/14 08:40:43 florian Exp $ */ +/* $Id: compress.h,v 1.6 2024/05/17 23:56:19 jsg Exp $ */ #ifndef DNS_COMPRESS_H #define DNS_COMPRESS_H 1 @@ -173,16 +173,6 @@ dns_decompress_init(dns_decompress_t *dctx, int edns, *\li 'dctx' to be a valid pointer. */ -void -dns_decompress_invalidate(dns_decompress_t *dctx); - -/*%< - * Invalidates 'dctx'. - * - * Requires: - *\li 'dctx' to be initialized - */ - void dns_decompress_setmethods(dns_decompress_t *dctx, unsigned int allowed); @@ -193,14 +183,4 @@ dns_decompress_setmethods(dns_decompress_t *dctx, unsigned int allowed); *\li 'dctx' to be initialized */ -dns_decompresstype_t -dns_decompress_type(dns_decompress_t *dctx); - -/*%< - * Returns 'dctx->type' - * - * Requires: - *\li 'dctx' to be initialized - */ - #endif /* DNS_COMPRESS_H */ diff --git a/usr.bin/dig/lib/dns/include/dns/message.h b/usr.bin/dig/lib/dns/include/dns/message.h index 7f547411bf0..6cd42be4176 100644 --- a/usr.bin/dig/lib/dns/include/dns/message.h +++ b/usr.bin/dig/lib/dns/include/dns/message.h @@ -985,27 +985,6 @@ dns_message_takebuffer(dns_message_t *msg, isc_buffer_t **buffer); * dynamically allocated via isc_buffer_allocate(). */ -isc_result_t -dns_message_rechecksig(dns_message_t *msg, dns_view_t *view); -/*%< - * Reset the signature state and then if the message was signed, - * verify the message. - * - * Requires: - * - *\li msg is a valid parsed message. - *\li view is a valid view or NULL - * - * Returns: - * - *\li #ISC_R_SUCCESS - the message was unsigned, or the message - * was signed correctly. - * - *\li #DNS_R_EXPECTEDTSIG - A TSIG was expected, but not seen - *\li #DNS_R_UNEXPECTEDTSIG - A TSIG was seen but not expected - *\li #DNS_R_TSIGVERIFYFAILURE - The TSIG failed to verify - */ - isc_result_t dns_message_buildopt(dns_message_t *msg, dns_rdataset_t **opt, unsigned int version, uint16_t udpsize, diff --git a/usr.bin/dig/lib/isc/include/isc/log.h b/usr.bin/dig/lib/isc/include/isc/log.h index 44214d9bf4f..54471ac1c74 100644 --- a/usr.bin/dig/lib/isc/include/isc/log.h +++ b/usr.bin/dig/lib/isc/include/isc/log.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.8 2020/09/14 08:40:44 florian Exp $ */ +/* $Id: log.h,v 1.9 2024/05/17 23:56:19 jsg Exp $ */ #ifndef ISC_LOG_H #define ISC_LOG_H 1 @@ -551,28 +551,6 @@ isc_log_wouldlog(isc_log_t *lctx, int level); * isc_log_write() calls and possible message preformatting. */ -void -isc_log_closefilelogs(isc_log_t *lctx); -/*%< - * Close all open files used by #ISC_LOG_TOFILE channels. - * - * Notes: - *\li This function is provided for programs that want to use their own - * log rolling mechanism rather than the one provided internally. - * For example, a program that wanted to keep daily logs would define - * a channel which used #ISC_LOG_ROLLNEVER, then once a day would - * rename the log file and call isc_log_closefilelogs(). - * - *\li #ISC_LOG_TOFILEDESC channels are unaffected. - * - * Requires: - *\li lctx is a valid context. - * - * Ensures: - *\li The open files are closed and will be reopened when they are - * next needed. - */ - void isc_log_setcontext(isc_log_t *lctx); /*%< -- 2.20.1