server/*.c: Don't try reading per-user configuration.

[disorder] / lib / fprintf.c

diff --git a/lib/fprintf.c b/lib/fprintf.c
index 741a31e4115f18d477ce462b9de4880da15aeca6..c88dcdd6ce3e8751d5dbb56fd18e907b83a155f9 100644 (file)
--- a/lib/fprintf.c
+++ b/lib/fprintf.c
@@ -1,21 +1,22 @@
 /*
  * This file is part of DisOrder
 /*
  * 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
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  * (at your option) any later version.

- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file lib/fprintf.c
+ * @brief UTF-8 workalike for fprintf() and vfprintf()

  */
 
 #include "common.h"
  */
 
 #include "common.h"


@@ -24,12 +25,29 @@
 #include <stddef.h>
 
 #include "printf.h"
 #include <stddef.h>
 
 #include "printf.h"

+#include "log.h"

 #include "sink.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) {
 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;
 int byte_fprintf(FILE *fp, const char *fmt, ...) {
   int n;
   va_list ap;