From 4e449baa29fbd1a4ced5507304878c424b54b084 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Sat, 7 Jan 2023 20:11:13 +1100
Subject: [PATCH] base: add back libheimbase HEIMDAL_xxx_ATTRIBUTEs

Fix regression introduced in 62f83ad0 by adding HEIMDAL_NORETURN_ATTRIBUTE and
HEIMDAL_PRINTF_ATTRIBUTE to function definitions, so they will be included in
heimbase-protos.h.
---
 lib/base/error.c    | 3 +++
 lib/base/heimbase.c | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/lib/base/error.c b/lib/base/error.c
index 6ba3bea41..bc289d3d9 100644
--- a/lib/base/error.c
+++ b/lib/base/error.c
@@ -86,6 +86,7 @@ heim_error_create_enomem(void)
 
 void
 heim_error_create_opt(heim_error_t *error, int error_code, const char *fmt, ...)
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 3, 4))
 {
     if (error) {
 	va_list ap;
@@ -97,6 +98,7 @@ heim_error_create_opt(heim_error_t *error, int error_code, const char *fmt, ...)
 
 heim_error_t
 heim_error_create(int error_code, const char *fmt, ...)
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 2, 3))
 {
     heim_error_t e;
     va_list ap;
@@ -110,6 +112,7 @@ heim_error_create(int error_code, const char *fmt, ...)
 
 heim_error_t
 heim_error_createv(int error_code, const char *fmt, va_list ap)
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 2, 0))
 {
     heim_error_t e;
     char *str;
diff --git a/lib/base/heimbase.c b/lib/base/heimbase.c
index f3bef7546..6af20f7d4 100644
--- a/lib/base/heimbase.c
+++ b/lib/base/heimbase.c
@@ -504,6 +504,8 @@ heim_base_once_f(heim_base_once_t *once, void *ctx, void (*func)(void *))
 
 void
 heim_abort(const char *fmt, ...)
+    HEIMDAL_NORETURN_ATTRIBUTE
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 1, 2))
 {
     va_list ap;
     va_start(ap, fmt);
@@ -517,6 +519,8 @@ heim_abort(const char *fmt, ...)
 
 void
 heim_abortv(const char *fmt, va_list ap)
+    HEIMDAL_NORETURN_ATTRIBUTE
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 1, 0))
 {
     static char str[1024];