From 0a0dc74b9103d757bf5c2cd2b8c14e5b825b232a Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 6 Oct 2020 12:56:39 -0400 Subject: printf: Adjust some calling conventions --- printf.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'printf.h') diff --git a/printf.h b/printf.h index 9be3b0b..a02c73b 100644 --- a/printf.h +++ b/printf.h @@ -21,11 +21,12 @@ #ifndef BFS_PRINTF_H #define BFS_PRINTF_H -#include "bftw.h" -#include "ctx.h" #include #include +struct BFTW; +struct bfs_ctx; + /** * A printf command, the result of parsing a single format string. */ @@ -34,33 +35,32 @@ struct bfs_printf; /** * Parse a -printf format string. * - * @param format - * The format string to parse. * @param ctx * The bfs context. + * @param format + * The format string to parse. * @return * The parsed printf command, or NULL on failure. */ -struct bfs_printf *parse_bfs_printf(const char *format, struct bfs_ctx *ctx); +struct bfs_printf *bfs_printf_parse(const struct bfs_ctx *ctx, const char *format); /** * Evaluate a parsed format string. * * @param file * The FILE to print to. - * @param command + * @param format * The parsed printf format. * @param ftwbuf - * The bftw() data for the current file. If needs_stat is true, statbuf - * must be non-NULL. + * The bftw() data for the current file. * @return * 0 on success, -1 on failure. */ -int bfs_printf(FILE *file, const struct bfs_printf *command, const struct BFTW *ftwbuf); +int bfs_printf(FILE *file, const struct bfs_printf *format, const struct BFTW *ftwbuf); /** * Free a parsed format string. */ -void free_bfs_printf(struct bfs_printf *command); +void bfs_printf_free(struct bfs_printf *format); #endif // BFS_PRINTF_H -- cgit v1.2.3