Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / fprintf.c

diff --git a/lib/fprintf.c b/lib/fprintf.c
index ac0c0d813f8e070acc2df1e258403234ea53df9b..c88dcdd6ce3e8751d5dbb56fd18e907b83a155f9 100644 (file)
--- a/lib/fprintf.c
+++ b/lib/fprintf.c
@@ -1,6 +1,6 @@
 /*
  * 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
  * it under the terms of the GNU General Public License as published by
  *
  * 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,7 +25,9 @@
 #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
 
 /** @brief vfprintf() workalike that always accepts UTF-8
  * @param fp Stream to write to


@@ -34,7 +36,10 @@
  * @return -1 on error or bytes written on success
  */
 int byte_vfprintf(FILE *fp, const char *fmt, va_list ap) {
  * @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
 }
 
 /** @brief fprintf() workalike that always accepts UTF-8