From 26f3c379c1603ebdc35d1653b677b9e22685fd81 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sun, 28 Jul 2024 10:47:59 -0400
Subject: prelude: Simplify attributes

---
 src/diag.h | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'src/diag.h')

diff --git a/src/diag.h b/src/diag.h
index da22f3a..d70bd43 100644
--- a/src/diag.h
+++ b/src/diag.h
@@ -47,7 +47,7 @@ struct bfs_loc {
  *
  *     bfs: func@src/file.c:0: Message
  */
-attr(printf(2, 3))
+_printf(2, 3)
 void bfs_diagf(const struct bfs_loc *loc, const char *format, ...);
 
 /**
@@ -67,8 +67,10 @@ void bfs_diagf(const struct bfs_loc *loc, const char *format, ...);
 /**
  * Print a message to standard error and abort.
  */
-attr(cold, printf(2, 3))
-noreturn void bfs_abortf(const struct bfs_loc *loc, const char *format, ...);
+_cold
+_printf(2, 3)
+_noreturn
+void bfs_abortf(const struct bfs_loc *loc, const char *format, ...);
 
 /**
  * Unconditional abort with a message.
@@ -166,13 +168,14 @@ const char *debug_flag_name(enum debug_flags flag);
 /**
  * Like perror(), but decorated like bfs_error().
  */
-attr(cold)
+_cold
 void bfs_perror(const struct bfs_ctx *ctx, const char *str);
 
 /**
  * Shorthand for printing error messages.
  */
-attr(cold, printf(2, 3))
+_cold
+_printf(2, 3)
 void bfs_error(const struct bfs_ctx *ctx, const char *format, ...);
 
 /**
@@ -180,7 +183,8 @@ void bfs_error(const struct bfs_ctx *ctx, const char *format, ...);
  *
  * @return Whether a warning was printed.
  */
-attr(cold, printf(2, 3))
+_cold
+_printf(2, 3)
 bool bfs_warning(const struct bfs_ctx *ctx, const char *format, ...);
 
 /**
@@ -188,67 +192,71 @@ bool bfs_warning(const struct bfs_ctx *ctx, const char *format, ...);
  *
  * @return Whether a debug message was printed.
  */
-attr(cold, printf(3, 4))
+_cold
+_printf(3, 4)
 bool bfs_debug(const struct bfs_ctx *ctx, enum debug_flags flag, const char *format, ...);
 
 /**
  * bfs_error() variant that takes a va_list.
  */
-attr(cold, printf(2, 0))
+_cold
+_printf(2, 0)
 void bfs_verror(const struct bfs_ctx *ctx, const char *format, va_list args);
 
 /**
  * bfs_warning() variant that takes a va_list.
  */
-attr(cold, printf(2, 0))
+_cold
+_printf(2, 0)
 bool bfs_vwarning(const struct bfs_ctx *ctx, const char *format, va_list args);
 
 /**
  * bfs_debug() variant that takes a va_list.
  */
-attr(cold, printf(3, 0))
+_cold
+_printf(3, 0)
 bool bfs_vdebug(const struct bfs_ctx *ctx, enum debug_flags flag, const char *format, va_list args);
 
 /**
  * Print the error message prefix.
  */
-attr(cold)
+_cold
 void bfs_error_prefix(const struct bfs_ctx *ctx);
 
 /**
  * Print the warning message prefix.
  */
-attr(cold)
+_cold
 bool bfs_warning_prefix(const struct bfs_ctx *ctx);
 
 /**
  * Print the debug message prefix.
  */
-attr(cold)
+_cold
 bool bfs_debug_prefix(const struct bfs_ctx *ctx, enum debug_flags flag);
 
 /**
  * Highlight parts of the command line in an error message.
  */
-attr(cold)
+_cold
 void bfs_argv_error(const struct bfs_ctx *ctx, const bool args[]);
 
 /**
  * Highlight parts of an expression in an error message.
  */
-attr(cold)
+_cold
 void bfs_expr_error(const struct bfs_ctx *ctx, const struct bfs_expr *expr);
 
 /**
  * Highlight parts of the command line in a warning message.
  */
-attr(cold)
+_cold
 bool bfs_argv_warning(const struct bfs_ctx *ctx, const bool args[]);
 
 /**
  * Highlight parts of an expression in a warning message.
  */
-attr(cold)
+_cold
 bool bfs_expr_warning(const struct bfs_ctx *ctx, const struct bfs_expr *expr);
 
 #endif // BFS_DIAG_H
-- 
cgit v1.2.3