From f855e35df2428c2b6b65f6e3637060809aafec94 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 14 Feb 2024 14:40:55 +0100
Subject: [PATCH] xwin: winclipboard: fix missing prototypes / missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[324/383] Compiling C object hw/xwin/winclipboard/xwinclip.exe.p/debug.c.obj
666../hw/xwin/winclipboard/debug.c:31:1: warning: no previous prototype for ‘winDebug’ [-Wmissing-prototypes]
667   31 | winDebug(const char *format, ...)
668      | ^~~~~~~~
669../hw/xwin/winclipboard/debug.c: In function ‘winDebug’:
670../hw/xwin/winclipboard/debug.c:37:3: warning: function ‘winDebug’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
671   37 |   count += vfprintf(stderr, format, ap);
672      |   ^~~~~
673../hw/xwin/winclipboard/debug.c: At top level:
674../hw/xwin/winclipboard/debug.c:44:1: warning: no previous prototype for ‘ErrorF’ [-Wmissing-prototypes]
675   44 | ErrorF(const char *format, ...)
676      | ^~~~~~
677../hw/xwin/winclipboard/debug.c: In function ‘ErrorF’:
678../hw/xwin/winclipboard/debug.c:49:3: warning: function ‘ErrorF’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
679   49 |   count = vfprintf(stderr, format, ap);
680      |   ^~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1295>
---
 hw/xwin/winclipboard/debug.c | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/hw/xwin/winclipboard/debug.c b/hw/xwin/winclipboard/debug.c
index 78ab6d902..ef8adc11f 100644
--- a/hw/xwin/winclipboard/debug.c
+++ b/hw/xwin/winclipboard/debug.c
@@ -26,27 +26,21 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#if 1
-int
-winDebug(const char *format, ...)
-{
-  int count;
-  va_list ap;
-  va_start(ap, format);
-  count = fprintf(stderr, "xwinclip: ");
-  count += vfprintf(stderr, format, ap);
-  va_end(ap);
-  return count;
-}
-#endif
+#include "internal.h"
 
-int
-ErrorF(const char *format, ...)
+void winDebug(const char *format, ...)
 {
-  int count;
   va_list ap;
   va_start(ap, format);
-  count = vfprintf(stderr, format, ap);
+  fprintf(stderr, "xwinclip: ");
+  vfprintf(stderr, format, ap);
+  va_end(ap);
+}
+
+void ErrorF(const char *format, ...)
+{
+  va_list ap;
+  va_start(ap, format);
+  vfprintf(stderr, format, ap);
   va_end(ap);
-  return count;
 }