From 3be06f138fb06fb5b22b6dbea4a1ea7634c08932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 18 Jun 2007 21:51:52 +0000 Subject: [PATCH] Provide __attribute__ for _hx509_abort. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21150 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hx509/cert.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/lib/hx509/cert.c b/lib/hx509/cert.c index 36d5fa378..72f24e18c 100644 --- a/lib/hx509/cert.c +++ b/lib/hx509/cert.c @@ -78,22 +78,6 @@ typedef struct hx509_name_constraints { #define GeneralSubtrees_SET(g,var) \ (g)->len = (var)->len, (g)->val = (var)->val; -/* - * - */ - -void -_hx509_abort(const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); - printf("\n"); - fflush(stdout); - abort(); -} - /* * */ @@ -2472,3 +2456,24 @@ hx509_cert_binary(hx509_context context, hx509_cert c, heim_octet_string *os) return ret; } + +/* + * Last to avoid lost __attribute__s due to #undef. + */ + +#undef __attribute__ +#define __attribute__(X) + +void +_hx509_abort(const char *fmt, ...) + __attribute__ ((noreturn, format (printf, 1, 2))) +{ + va_list ap; + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + printf("\n"); + fflush(stdout); + abort(); +} +