upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 18:10:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

noreturn RT #20257

Browse source
This commit is contained in:
Francis Dupont 2009-09-29 15:06:07 +00:00
parent 1e733ffc11
commit debd489a44
37 changed files with 180 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,6 @@
2792. [port] win32: 32/64 bit cleanups. [RT #128244]
2793. [port] Add some noreturn attributes. [RT #20257]
2792. [port] win32: 32/64 bit cleanups. [RT #20335]
2691. [func] dnssec-signzone: retain the existing NSEC or NSEC3
chain when re-signing a previously-signed zone.

5
bin/check/named-checkconf.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkconf.c,v 1.49 2009/07/13 06:57:21 marka Exp $ */
/* $Id: named-checkconf.c,v 1.50 2009/09/29 15:06:05 fdupont Exp $ */
/*! \file */
@ -59,6 +59,9 @@ isc_log_t *logc = NULL;
} while (0)
/*% usage */
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "usage: %s [-h] [-j] [-v] [-z] [-t directory] "

5
bin/check/named-checkzone.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkzone.c,v 1.54 2009/05/29 02:14:31 marka Exp $ */
/* $Id: named-checkzone.c,v 1.55 2009/09/29 15:06:05 fdupont Exp $ */
/*! \file */
@ -70,6 +70,9 @@ static enum { progmode_check, progmode_compile } progmode;
} \
} while (0)
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr,

5
bin/confgen/ddns-confgen.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ddns-confgen.c,v 1.8 2009/07/29 17:52:00 each Exp $ */
/* $Id: ddns-confgen.c,v 1.9 2009/09/29 15:06:05 fdupont Exp $ */
/*! \file */
@ -60,6 +60,9 @@ const char *progname;
isc_boolean_t verbose = ISC_FALSE;
ISC_PLATFORM_NORETURN_PRE static void
usage(int status) ISC_PLATFORM_NORETURN_POST;
static void
usage(int status) {

5
bin/confgen/rndc-confgen.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rndc-confgen.c,v 1.4 2009/06/15 23:47:59 tbox Exp $ */
/* $Id: rndc-confgen.c,v 1.5 2009/09/29 15:06:05 fdupont Exp $ */
/*! \file */
@ -69,6 +69,9 @@ isc_boolean_t verbose = ISC_FALSE;
const char *keyfile, *keydef;
ISC_PLATFORM_NORETURN_PRE static void
usage(int status) ISC_PLATFORM_NORETURN_POST;
static void
usage(int status) {

8
bin/confgen/util.h
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: util.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
/* $Id: util.h,v 1.4 2009/09/29 15:06:05 fdupont Exp $ */
#ifndef RNDC_UTIL_H
#define RNDC_UTIL_H 1
@ -22,6 +22,7 @@
/*! \file */
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/formatcheck.h>
@ -42,8 +43,9 @@ ISC_LANG_BEGINDECLS
void
notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_PLATFORM_NORETURN_PRE void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
ISC_LANG_ENDDECLS

5
bin/dig/dig.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.231 2009/09/23 06:21:36 each Exp $ */
/* $Id: dig.c,v 1.232 2009/09/29 15:06:05 fdupont Exp $ */
/*! \file */
@ -138,6 +138,9 @@ print_usage(FILE *fp) {
" [ host [@local-server] {local-d-opt} [...]]\n", fp);
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
print_usage(stderr);

5
bin/dig/host.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: host.c,v 1.119 2009/09/08 23:23:22 marka Exp $ */
/* $Id: host.c,v 1.120 2009/09/29 15:06:05 fdupont Exp $ */
/*! \file */
@ -141,6 +141,9 @@ rcode_totext(dns_rcode_t rcode)
return totext.deconsttext;
}
ISC_PLATFORM_NORETURN_PRE static void
show_usage(void) ISC_PLATFORM_NORETURN_POST;
static void
show_usage(void) {
fputs(

7
bin/dig/include/dig/dig.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.h,v 1.110 2009/09/15 23:48:09 tbox Exp $ */
/* $Id: dig.h,v 1.111 2009/09/29 15:06:06 fdupont Exp $ */
#ifndef DIG_H
#define DIG_H
@ -292,8 +292,9 @@ isc_result_t
get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
isc_boolean_t strict);
void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_PLATFORM_NORETURN_PRE void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
void
debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);

5
bin/dnssec/dnssec-dsfromkey.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-dsfromkey.c,v 1.13 2009/09/01 00:22:24 jinmei Exp $ */
/* $Id: dnssec-dsfromkey.c,v 1.14 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -282,6 +282,9 @@ emit(unsigned int dtype, isc_boolean_t showall, char *lookaside,
putchar('\n');
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "Usage:\n");

5
bin/dnssec/dnssec-keyfromlabel.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-keyfromlabel.c,v 1.15 2009/09/23 16:01:56 each Exp $ */
/* $Id: dnssec-keyfromlabel.c,v 1.16 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -51,6 +51,9 @@ int verbose;
static const char *algs = "RSA | RSAMD5 | DH | DSA | RSASHA1 |"
" NSEC3DSA | NSEC3RSASHA1";
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "Usage:\n");

5
bin/dnssec/dnssec-keygen.c
View file

@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-keygen.c,v 1.96 2009/09/23 16:01:56 each Exp $ */
/* $Id: dnssec-keygen.c,v 1.97 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -73,6 +73,9 @@ dsa_size_ok(int size) {
return (ISC_TF(size >= 512 && size <= 1024 && size % 64 == 0));
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "Usage:\n");

5
bin/dnssec/dnssec-revoke.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-revoke.c,v 1.12 2009/09/23 16:01:56 each Exp $ */
/* $Id: dnssec-revoke.c,v 1.13 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -46,6 +46,9 @@ int verbose;
static isc_mem_t *mctx = NULL;
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "Usage:\n");

5
bin/dnssec/dnssec-settime.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-settime.c,v 1.13 2009/09/23 16:01:56 each Exp $ */
/* $Id: dnssec-settime.c,v 1.14 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -48,6 +48,9 @@ int verbose;
static isc_mem_t *mctx = NULL;
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "Usage:\n");

5
bin/dnssec/dnssec-signzone.c
View file

@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signzone.c,v 1.237 2009/09/25 23:48:10 tbox Exp $ */
/* $Id: dnssec-signzone.c,v 1.238 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -3273,6 +3273,9 @@ print_version(FILE *fp) {
fprintf(fp, "; dnssec_signzone version " VERSION "\n");
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
fprintf(stderr, "Usage:\n");

7
bin/dnssec/dnssectool.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssectool.h,v 1.25 2009/09/04 02:31:29 marka Exp $ */
/* $Id: dnssectool.h,v 1.26 2009/09/29 15:06:06 fdupont Exp $ */
#ifndef DNSSECTOOL_H
#define DNSSECTOOL_H 1
@ -27,8 +27,9 @@
typedef void (fatalcallback_t)(void);
void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_PLATFORM_NORETURN_PRE void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
void
setfatalcallback(fatalcallback_t *callback);

7
bin/named/include/named/main.h
View file

@ -15,15 +15,16 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.h,v 1.15 2007/06/19 23:46:59 tbox Exp $ */
/* $Id: main.h,v 1.16 2009/09/29 15:06:06 fdupont Exp $ */
#ifndef NAMED_MAIN_H
#define NAMED_MAIN_H 1
/*! \file */
void
ns_main_earlyfatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_PLATFORM_NORETURN_PRE void
ns_main_earlyfatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
void
ns_main_earlywarning(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);

11
bin/named/main.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.173 2009/09/01 18:40:25 jinmei Exp $ */
/* $Id: main.c,v 1.174 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -138,6 +138,10 @@ ns_main_earlyfatal(const char *format, ...) {
exit(1);
}
ISC_PLATFORM_NORETURN_PRE static void
assertion_failed(const char *file, int line, isc_assertiontype_t type,
const char *cond) ISC_PLATFORM_NORETURN_POST;
static void
assertion_failed(const char *file, int line, isc_assertiontype_t type,
const char *cond)
@ -207,9 +211,10 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type,
exit(1);
}
static void
ISC_PLATFORM_NORETURN_PRE static void
library_fatal_error(const char *file, int line, const char *format,
va_list args) ISC_FORMAT_PRINTF(3, 0);
va_list args)
ISC_FORMAT_PRINTF(3, 0) ISC_PLATFORM_NORETURN_POST;
static void
library_fatal_error(const char *file, int line, const char *format,

6
bin/named/server.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.548 2009/09/10 01:49:29 each Exp $ */
/* $Id: server.c,v 1.549 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -243,8 +243,8 @@ static const struct {
{ NULL, ISC_FALSE }
};
static void
fatal(const char *msg, isc_result_t result);
ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *msg, isc_result_t result) ISC_PLATFORM_NORETURN_POST;
static void
ns_server_reload(isc_task_t *task, isc_event_t *event);

8
bin/nsupdate/nsupdate.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsupdate.c,v 1.172 2009/09/01 00:22:25 jinmei Exp $ */
/* $Id: nsupdate.c,v 1.173 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -181,8 +181,10 @@ typedef struct nsu_requestinfo {
static void
sendrequest(isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
dns_message_t *msg, dns_request_t **request);
static void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
static void
debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);

5
bin/rndc/rndc.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rndc.c,v 1.125 2009/05/04 17:38:56 jreed Exp $ */
/* $Id: rndc.c,v 1.126 2009/09/29 15:06:06 fdupont Exp $ */
/*! \file */
@ -90,6 +90,9 @@ static isc_uint32_t serial;
static void rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task);
ISC_PLATFORM_NORETURN_PRE static void
usage(int status) ISC_PLATFORM_NORETURN_POST;
static void
usage(int status) {
fprintf(stderr, "\

8
bin/rndc/util.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: util.h,v 1.10 2007/06/19 23:46:59 tbox Exp $ */
/* $Id: util.h,v 1.11 2009/09/29 15:06:06 fdupont Exp $ */
#ifndef RNDC_UTIL_H
#define RNDC_UTIL_H 1
@ -23,6 +23,7 @@
/*! \file */
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/formatcheck.h>
@ -43,8 +44,9 @@ ISC_LANG_BEGINDECLS
void
notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_PLATFORM_NORETURN_PRE void
fatal(const char *format, ...)
ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
ISC_LANG_ENDDECLS

5
bin/tools/nsec3hash.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsec3hash.c,v 1.4 2009/03/07 23:47:45 tbox Exp $ */
/* $Id: nsec3hash.c,v 1.5 2009/09/29 15:06:06 fdupont Exp $ */
#include <config.h>
@ -36,6 +36,9 @@
const char *program = "nsec3hash";
ISC_PLATFORM_NORETURN_PRE static void
fatal(const char *format, ...) ISC_PLATFORM_NORETURN_POST;
static void
fatal(const char *format, ...) {
va_list args;

16
configure.in
View file

@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.479 $)
AC_REVISION($Revision: 1.480 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
@ -338,6 +338,20 @@ AC_TRY_COMPILE([],[long long i = 0; return (0);],
ISC_PLATFORM_HAVELONGLONG="#undef ISC_PLATFORM_HAVELONGLONG"])
AC_SUBST(ISC_PLATFORM_HAVELONGLONG)
#
# check for GCC noreturn attribute
#
AC_MSG_CHECKING(for GCC noreturn attribute)
AC_TRY_COMPILE([],[void foo() __attribute__((noreturn));],
[AC_MSG_RESULT(yes)
ISC_PLATFORM_NORETURN_PRE="#define ISC_PLATFORM_NORETURN_PRE"
ISC_PLATFORM_NORETURN_POST="#define ISC_PLATFORM_NORETURN_POST __attribute__((noreturn))"],
[AC_MSG_RESULT(no)
ISC_PLATFORM_NORETURN_PRE="#define ISC_PLATFORM_NORETURN_PRE"
ISC_PLATFORM_NORETURN="#define ISC_PLATFORM_NORETURN_POST"])
AC_SUBST(ISC_PLATFORM_NORETURN_PRE)
AC_SUBST(ISC_PLATFORM_NORETURN_POST)
#
# check if we have lifconf
#

4
lib/dns/include/dns/rbt.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rbt.h,v 1.73 2009/01/17 23:47:43 tbox Exp $ */
/* $Id: rbt.h,v 1.74 2009/09/29 15:06:06 fdupont Exp $ */
#ifndef DNS_RBT_H
#define DNS_RBT_H 1
@ -909,7 +909,7 @@ dns_rbtnodechain_nextflat(dns_rbtnodechain_t *chain, dns_name_t *name);
} while (0)
#else /* DNS_RBT_USEISCREFCOUNT */
#define dns_rbtnode_refinit(node, n) ((node)->references = (n))
#define dns_rbtnode_refdestroy(node) (REQUIRE((node)->references == 0))
#define dns_rbtnode_refdestroy(node) REQUIRE((node)->references == 0)
#define dns_rbtnode_refcurrent(node) ((node)->references)
#define dns_rbtnode_refincrement0(node, refs) \
do { \

7
lib/export/samples/nsprobe.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsprobe.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
/* $Id: nsprobe.c,v 1.5 2009/09/29 15:06:06 fdupont Exp $ */
#include <config.h>
@ -1015,8 +1015,11 @@ probe_domain(struct probe_trans *trans) {
return (result);
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage() {
usage(void) {
fprintf(stderr, "usage: nsprobe [-d] [-v [-v...]] [-c cache_address] "
"[input_file]\n");

7
lib/export/samples/sample-async.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sample-async.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
/* $Id: sample-async.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
#include <config.h>
@ -247,8 +247,11 @@ dispatch_query(struct query_trans *trans) {
return (result);
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage() {
usage(void) {
fprintf(stderr, "usage: sample-async [-s server_address] [-t RR type] "
"input_file\n");

7
lib/export/samples/sample-request.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sample-request.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
/* $Id: sample-request.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
#include <config.h>
@ -57,8 +57,11 @@
static isc_mem_t *mctx;
static dns_fixedname_t fixedqname;
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage() {
usage(void) {
fprintf(stderr, "sample-request [-t RRtype] server_address hostname\n");
exit(1);

7
lib/export/samples/sample-update.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sample-update.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
/* $Id: sample-update.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
#include <config.h>
@ -67,8 +67,11 @@ static void update_addordelete(isc_mem_t *mctx, char *cmdline,
isc_boolean_t isdelete, dns_name_t *name);
static void evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name);
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage() {
usage(void) {
fprintf(stderr, "sample-update "
"[-a auth_server] "
"[-k keyfile] "

7
lib/export/samples/sample.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sample.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
/* $Id: sample.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
#include <config.h>
@ -78,8 +78,11 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner) {
return (ISC_R_SUCCESS);
}
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage() {
usage(void) {
fprintf(stderr, "sample [-t RRtype] "
"[[-a algorithm] [-e] -k keyname -K keystring] "
"[-s domain:serveraddr_for_domain ] "

23
lib/isc/assertions.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: assertions.c,v 1.25 2009/09/02 23:48:02 tbox Exp $ */
/* $Id: assertions.c,v 1.26 2009/09/29 15:06:07 fdupont Exp $ */
/*! \file */
@ -39,24 +39,33 @@
/*%
* Forward.
*/
/* coverity[+kill] */
static void
default_callback(const char *, int, isc_assertiontype_t, const char *);
static isc_assertioncallback_t isc_assertion_failed_cb = default_callback;
/*%
* Public.
*/
LIBISC_EXTERNAL_DATA isc_assertioncallback_t isc_assertion_failed =
default_callback;
/*% assertion failed handler */
/* coverity[+kill] */
void
isc_assertion_failed(const char *file, int line, isc_assertiontype_t type,
const char *cond)
{
isc_assertion_failed_cb(file, line, type, cond);
abort();
/* NOTREACHED */
}
/*% Set callback. */
void
isc_assertion_setcallback(isc_assertioncallback_t cb) {
if (cb == NULL)
isc_assertion_failed = default_callback;
isc_assertion_failed_cb = default_callback;
else
isc_assertion_failed = cb;
isc_assertion_failed_cb = cb;
}
/*% Type to Text */
@ -127,6 +136,4 @@ default_callback(const char *file, int line, isc_assertiontype_t type,
}
}
fflush(stderr);
abort();
/* NOTREACHED */
}

6
lib/isc/include/isc/assertions.h
View file

@ -16,7 +16,7 @@
*/
/*
* $Id: assertions.h,v 1.26 2008/10/15 23:47:31 tbox Exp $
* $Id: assertions.h,v 1.27 2009/09/29 15:06:07 fdupont Exp $
*/
/*! \file isc/assertions.h
*/
@ -41,7 +41,9 @@ typedef void (*isc_assertioncallback_t)(const char *, int, isc_assertiontype_t,
const char *);
/* coverity[+kill] */
LIBISC_EXTERNAL_DATA extern isc_assertioncallback_t isc_assertion_failed;
ISC_PLATFORM_NORETURN_PRE
void isc_assertion_failed(const char *, int, isc_assertiontype_t,
const char *) ISC_PLATFORM_NORETURN_POST;
void
isc_assertion_setcallback(isc_assertioncallback_t);

7
lib/isc/include/isc/error.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: error.h,v 1.20 2007/06/19 23:47:18 tbox Exp $ */
/* $Id: error.h,v 1.21 2009/09/29 15:06:07 fdupont Exp $ */
#ifndef ISC_ERROR_H
#define ISC_ERROR_H 1
@ -26,6 +26,7 @@
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/platform.h>
ISC_LANG_BEGINDECLS
@ -45,9 +46,9 @@ isc_error_unexpected(const char *, int, const char *, ...)
ISC_FORMAT_PRINTF(3, 4);
/*% fatal error */
void
ISC_PLATFORM_NORETURN_PRE void
isc_error_fatal(const char *, int, const char *, ...)
ISC_FORMAT_PRINTF(3, 4);
ISC_FORMAT_PRINTF(3, 4) ISC_PLATFORM_NORETURN_POST;
/*% runtimecheck error */
void

8
lib/isc/include/isc/platform.h.in
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: platform.h.in,v 1.52 2009/09/01 18:40:25 jinmei Exp $ */
/* $Id: platform.h.in,v 1.53 2009/09/29 15:06:07 fdupont Exp $ */
#ifndef ISC_PLATFORM_H
#define ISC_PLATFORM_H 1
@ -294,6 +294,12 @@
*/
@ISC_PLATFORM_OPENSSLHASH@
/*
* Defines for the noreturn attribute.
*/
@ISC_PLATFORM_NORETURN_PRE@
@ISC_PLATFORM_NORETURN_POST@
/***
*** Windows dll support.
***/

6
lib/isc/include/isc/refcount.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: refcount.h,v 1.15 2007/06/19 23:47:18 tbox Exp $ */
/* $Id: refcount.h,v 1.16 2009/09/29 15:06:07 fdupont Exp $ */
#ifndef ISC_REFCOUNT_H
#define ISC_REFCOUNT_H 1
@ -103,7 +103,7 @@ typedef struct isc_refcount {
isc_int32_t refs;
} isc_refcount_t;
#define isc_refcount_destroy(rp) (REQUIRE((rp)->refs == 0))
#define isc_refcount_destroy(rp) REQUIRE((rp)->refs == 0)
#define isc_refcount_current(rp) ((unsigned int)((rp)->refs))
#define isc_refcount_increment0(rp, tp) \
@ -192,7 +192,7 @@ typedef struct isc_refcount {
int refs;
} isc_refcount_t;
#define isc_refcount_destroy(rp) (REQUIRE((rp)->refs == 0))
#define isc_refcount_destroy(rp) REQUIRE((rp)->refs == 0)
#define isc_refcount_current(rp) ((unsigned int)((rp)->refs))
#define isc_refcount_increment0(rp, tp) \

8
lib/isc/win32/include/isc/platform.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: platform.h,v 1.17 2008/12/01 03:51:47 marka Exp $ */
/* $Id: platform.h,v 1.18 2009/09/29 15:06:07 fdupont Exp $ */
#ifndef ISC_PLATFORM_H
#define ISC_PLATFORM_H 1
@ -63,6 +63,12 @@
*/
#undef ISC_PLATFORM_HAVESYSUNH
/*
* Defines for the noreturn attribute.
*/
#define ISC_PLATFORM_NORETURN_PRE __declspec(noreturn)
#define ISC_PLATFORM_NORETURN_POST
/*
* Set up a macro for importing and exporting from the DLL
*/

2
lib/isc/win32/libisc.def
View file

@ -48,6 +48,7 @@ isc__app_run
isc__app_shutdown
isc__app_start
isc__app_unblock
isc_assertion_failed
isc_assertion_setcallback
isc_assertion_typetotext
isc_backtrace_getsymbol
@ -552,7 +553,6 @@ syslog
EXPORTS
isc_assertion_failed DATA
isc_commandline_argument DATA
isc_commandline_errprint DATA
isc_commandline_index DATA