X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..16b0fea8ae1a581d568dbee2efa2932aa4e6fcce:/lib/fprintf.c diff --git a/lib/fprintf.c b/lib/fprintf.c index b4de830..c88dcdd 100644 --- a/lib/fprintf.c +++ b/lib/fprintf.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2007, 2008 Richard Kettlewell + * Copyright (C) 2004, 2007-2009 Richard Kettlewell * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,12 +25,29 @@ #include #include "printf.h" +#include "log.h" #include "sink.h" +#include "mem.h" +/** @brief vfprintf() workalike that always accepts UTF-8 + * @param fp Stream to write to + * @param fmt Format string + * @param ap Format arguments + * @return -1 on error or bytes written on success + */ int byte_vfprintf(FILE *fp, const char *fmt, va_list ap) { - return byte_vsinkprintf(sink_stdio(0, fp), fmt, ap); + struct sink *s = sink_stdio(0, fp); + int rc = byte_vsinkprintf(s, fmt, ap); + xfree(s); + return rc; } +/** @brief fprintf() workalike that always accepts UTF-8 + * @param fp Stream to write to + * @param fmt Format string + * @param ... Format arguments + * @return -1 on error or bytes written on success + */ int byte_fprintf(FILE *fp, const char *fmt, ...) { int n; va_list ap;