From 29a49f5d150911428a35943be8d9fc226865eb1b Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 2 Jan 2019 17:00:40 -0500 Subject: color: Check format strings + args for cfprintf() %{cc} is now ${cc} to avoid warnings about an unrecognized format specifier, and %P and %L are now %pP and %pL to make them look more like standard format strings. --- color.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'color.h') diff --git a/color.h b/color.h index a68378e..78db64a 100644 --- a/color.h +++ b/color.h @@ -18,6 +18,7 @@ #define BFS_COLOR_H #include "bftw.h" +#include "util.h" #include #include #include @@ -95,18 +96,20 @@ int cfclose(CFILE *cfile); * @param format * A printf()-style format string, supporting these format specifiers: * - * %%: A literal '%' * %c: A single character * %d: An integer * %g: A double * %s: A string * %zu: A size_t * %m: strerror(errno) - * %P: A colored file path, from a const struct BFTW * argument - * %L: A colored link target, from a const struct BFTW * argument - * %{cc}: Change the color to 'cc' + * %pP: A colored file path, from a const struct BFTW * argument + * %pL: A colored link target, from a const struct BFTW * argument + * %%: A literal '%' + * ${cc}: Change the color to 'cc' + * $$: A literal '$' * @return 0 on success, -1 on failure. */ +BFS_FORMATTER(2, 3) int cfprintf(CFILE *cfile, const char *format, ...); /** -- cgit v1.2.3