qt4: fix COM leak and handle errors

[vlc] / compat / flockfile.c

diff --git a/compat/flockfile.c b/compat/flockfile.c
index ebc28544ecea4c8dec4ccce36d56f047d44b87b6..d01fd1ffd83ac6fc82f2682ea91c68c5a72c2ccc 100644 (file)
--- a/compat/flockfile.c
+++ b/compat/flockfile.c
@@ -1,21 +1,21 @@
 /*****************************************************************************
  * flockfile.c: POSIX unlocked I/O stream stubs
  *****************************************************************************
- * Copyright © 2011 Rémi Denis-Courmont
+ * Copyright © 2011-2012 Rémi Denis-Courmont
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or
  * (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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -24,41 +24,53 @@
 
 #include <stdio.h>
 
-/* There is no way to implement this for real. We just pretend it works and
- * hope for the best (especially when outputting to stderr). */
+#ifdef _WIN32
+# ifndef HAVE__LOCK_FILE
+#  warning Broken SDK: VLC logs will be garbage.
+#  define _lock_file(s) ((void)(s))
+#  define _unlock_file(s) ((void)(s))
+#  undef _getc_nolock
+#  define _getc_nolock(s) getc(s)
+#  undef _putc_nolock
+#  define _putc_nolock(s,c) putc(s,c)
+# endif
 
 void flockfile (FILE *stream)
 {
-    (void) stream;
+    _lock_file (stream);
 }
 
 int ftrylockfile (FILE *stream)
 {
-    (void) stream;
+    flockfile (stream); /* Move along people, there is nothing to see here. */
     return 0;
 }
 
 void funlockfile (FILE *stream)
 {
-    (void) stream;
+    _unlock_file (stream);
 }
 
 int getc_unlocked (FILE *stream)
 {
-    return getc (stream);
+    return _getc_nolock (stream);
 }
 
-int getchar_unlocked (void)
+int putc_unlocked (int c, FILE *stream)
 {
-    return getchar ();
+    return _putc_nolock (c, stream);
 }
 
-int putc_unlocked (int c, FILE *stream)
+#else
+# error flockfile not implemented on your platform!
+#endif
+
+int getchar_unlocked (void)
 {
-    return putc (c, stream);
+    return getc_unlocked (stdin);
 }
 
 int putchar_unlocked (int c)
 {
-    return putchar (c);
+    return putc_unlocked (c, stdout);
 }