oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

base: add back libheimbase HEIMDAL_xxx_ATTRIBUTEs

Browse Source 
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.
This commit is contained in:
Luke Howard
2023-01-07 20:11:13 +11:00
parent 44e52a32b3
commit 4e449baa29
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base/error.c
View File

@@ -86,6 +86,7 @@ heim_error_create_enomem(void)
void void
heim_error_create_opt(heim_error_t *error, int error_code, const char *fmt, ...) heim_error_create_opt(heim_error_t *error, int error_code, const char *fmt, ...)
HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 3, 4))
{ {
if (error) { if (error) {
va_list ap; 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_t
heim_error_create(int error_code, const char *fmt, ...) heim_error_create(int error_code, const char *fmt, ...)
HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 2, 3))
{ {
heim_error_t e; heim_error_t e;
va_list ap; va_list ap;
@@ -110,6 +112,7 @@ heim_error_create(int error_code, const char *fmt, ...)
heim_error_t heim_error_t
heim_error_createv(int error_code, const char *fmt, va_list ap) heim_error_createv(int error_code, const char *fmt, va_list ap)
HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 2, 0))
{ {
heim_error_t e; heim_error_t e;
char *str; char *str;

4
lib/base/heimbase.c
View File

@@ -504,6 +504,8 @@ heim_base_once_f(heim_base_once_t *once, void *ctx, void (*func)(void *))
void void
heim_abort(const char *fmt, ...) heim_abort(const char *fmt, ...)
HEIMDAL_NORETURN_ATTRIBUTE
HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 1, 2))
{ {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
@@ -517,6 +519,8 @@ heim_abort(const char *fmt, ...)
void void
heim_abortv(const char *fmt, va_list ap) heim_abortv(const char *fmt, va_list ap)
HEIMDAL_NORETURN_ATTRIBUTE
HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 1, 0))
{ {
static char str[1024]; static char str[1024];