consume __printflike

yamt · Aug 12, 2024 · e272c53 · e272c53
1 parent b08e8fe
commit e272c53
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/lib/exec_context.h b/lib/exec_context.h
@@ -354,6 +354,6 @@ int check_interrupt_interval_ms(struct exec_context *ctx);
 int vtrap(struct exec_context *ctx, enum trapid id, const char *fmt,
           va_list ap);
 int trap_with_id(struct exec_context *ctx, enum trapid id, const char *fmt,
-                 ...) __attribute__((__format__(__printf__, 3, 4)));
+                 ...) __printflike(3, 4);
 
 __END_EXTERN_C
diff --git a/lib/host_instance.h b/lib/host_instance.h
@@ -104,7 +104,7 @@ int host_func_getptr(struct exec_context *ctx, struct meminst *mem,
 int host_func_getptr2(struct exec_context *ctx, struct meminst *mem,
                       uint32_t ptr, uint32_t size, void **pp, bool *movedp);
 int host_func_trap(struct exec_context *ctx, const char *fmt, ...)
-        __attribute__((__format__(__printf__, 2, 3)));
+        __printflike(2, 3);
 struct restart_info;
 int schedule_call_from_hostfunc(struct exec_context *ctx,
                                 struct restart_info *restart,

diff --git a/lib/nbio.h b/lib/nbio.h
@@ -23,10 +23,8 @@ bool is_again(int error);
  *   the code (namely xlog and repl) needs to deal with non-blocking fds.
  */
 int nbio_vfprintf(FILE *fp, const char *fmt, va_list ap);
-int nbio_fprintf(FILE *fp, const char *fmt, ...)
-        __attribute__((__format__(__printf__, 2, 3)));
-int nbio_printf(const char *fmt, ...)
-        __attribute__((__format__(__printf__, 1, 2)));
+int nbio_fprintf(FILE *fp, const char *fmt, ...) __printflike(2, 3);
+int nbio_printf(const char *fmt, ...) __printflike(1, 2);
 ssize_t nbio_getline(char **linep, size_t *linecapp, FILE *fp);
 
 __END_EXTERN_C
diff --git a/lib/report.h b/lib/report.h
@@ -18,8 +18,7 @@ __BEGIN_EXTERN_C
  */
 
 void vreport(struct report *r, const char *fmt, va_list ap);
-void report_error(struct report *r, const char *fmt, ...)
-        __attribute__((__format__(__printf__, 2, 3)));
+void report_error(struct report *r, const char *fmt, ...) __printflike(2, 3);
 void report_init(struct report *r);
 void report_clear(struct report *r);
 const char *report_getmessage(const struct report *r);

diff --git a/lib/validation.h b/lib/validation.h
@@ -88,7 +88,7 @@ int pop_ctrlframe(uint32_t pc, bool is_else, struct ctrlframe *cframe,
 void mark_unreachable(struct validation_context *ctx);
 const struct resulttype *label_types(const struct ctrlframe *cframe);
 int validation_failure(struct validation_context *ctx, const char *fmt, ...)
-        __attribute__((__format__(__printf__, 2, 3)));
+        __printflike(2, 3);
 struct resulttype *returntype(struct validation_context *ctx);
 void validation_context_init(struct validation_context *ctx);
 void validation_context_reuse(struct validation_context *ctx);

diff --git a/lib/xlog.h b/lib/xlog.h
@@ -3,16 +3,12 @@
 
 __BEGIN_EXTERN_C
 
-void xlog_printf(const char *, ...)
-        __attribute__((__format__(__printf__, 1, 2)));
+void xlog_printf(const char *, ...) __printflike(1, 2);
 
-void xlog_printf_raw(const char *, ...)
-        __attribute__((__format__(__printf__, 1, 2)));
+void xlog_printf_raw(const char *, ...) __printflike(1, 2);
 
-void xlog__trace(const char *, ...)
-        __attribute__((__format__(__printf__, 1, 2)));
-void xlog_error(const char *, ...)
-        __attribute__((__format__(__printf__, 1, 2)));
+void xlog__trace(const char *, ...) __printflike(1, 2);
+void xlog_error(const char *, ...) __printflike(1, 2);
 
 #if defined(TOYWASM_ENABLE_TRACING)
 extern int xlog_tracing;