File LibVNCServer-update-testsuite.patch of Package LibVNCServer.25842

diff -upr LibVNCServer-0.9.9/test/bmp.h /home/pgajdos/branch/15/LibVNCServer/libvncserver-LibVNCServer-0.9.10/test/bmp.h
--- LibVNCServer-0.9.9/test/bmp.h	2012-05-04 16:19:00.000000000 +0200
+++ /home/pgajdos/branch/15/LibVNCServer/libvncserver-LibVNCServer-0.9.10/test/bmp.h	2014-10-21 17:57:11.000000000 +0200
@@ -13,8 +13,8 @@
  * wxWindows Library License for more details.
 */
 
-// This provides rudimentary facilities for loading and saving true color
-// BMP and PPM files
+/* This provides rudimentary facilities for loading and saving true color */
+/* BMP and PPM files */
 
 #ifndef __BMP_H__
 #define __BMP_H__
@@ -26,16 +26,20 @@ enum BMPPIXELFORMAT {BMP_RGB=0, BMP_RGBX
 extern "C" {
 #endif
 
-// This will load a Windows bitmap from a file and return a buffer with the
-// specified pixel format, scanline alignment, and orientation.  The width and
-// height are returned in w and h.
+/*
+ * This will load a Windows bitmap from a file and return a buffer with the
+ * specified pixel format, scanline alignment, and orientation.  The width and
+ * height are returned in w and h.
+ */
 
 int loadbmp(char *filename, unsigned char **buf, int *w, int *h,
 	enum BMPPIXELFORMAT f, int align, int dstbottomup);
 
-// This will save a buffer with the specified pixel format, pitch, orientation,
-// width, and height as a 24-bit Windows bitmap or PPM (the filename determines
-// which format to use)
+/*
+ * This will save a buffer with the specified pixel format, pitch, orientation,
+ * width, and height as a 24-bit Windows bitmap or PPM (the filename determines
+ * which format to use)
+ */
 
 int savebmp(char *filename, unsigned char *buf, int w, int h,
 	enum BMPPIXELFORMAT f, int srcpitch, int srcbottomup);
diff -upr LibVNCServer-0.9.9/test/encodingstest.c /home/pgajdos/branch/15/LibVNCServer/libvncserver-LibVNCServer-0.9.10/test/encodingstest.c
--- LibVNCServer-0.9.9/test/encodingstest.c	2012-05-04 16:19:00.000000000 +0200
+++ /home/pgajdos/branch/15/LibVNCServer/libvncserver-LibVNCServer-0.9.10/test/encodingstest.c	2014-10-21 17:57:11.000000000 +0200
@@ -172,6 +172,7 @@ static void* clientLoop(void* data) {
 	}
 	free(((clientData*)client->clientData)->display);
 	free(client->clientData);
+	client->clientData = NULL;
 	if(client->frameBuffer)
 		free(client->frameBuffer);
 	rfbClientCleanup(client);
@@ -256,7 +257,7 @@ rfbTestLog(const char *format, ...)
 
 	time(&log_clock);
 	strftime(buf, 255, "%d/%m/%Y %X (client) ", localtime(&log_clock));
-	fprintf(stderr,buf);
+	fprintf(stderr,"%s",buf);
 
 	vfprintf(stderr, format, args);
 	fflush(stderr);
diff -upr LibVNCServer-0.9.9/test/Makefile.am /home/pgajdos/branch/15/LibVNCServer/libvncserver-LibVNCServer-0.9.10/test/Makefile.am
--- LibVNCServer-0.9.9/test/Makefile.am	2012-05-04 16:19:00.000000000 +0200
+++ /home/pgajdos/branch/15/LibVNCServer/libvncserver-LibVNCServer-0.9.10/test/Makefile.am	2014-10-21 17:57:11.000000000 +0200
@@ -9,7 +9,7 @@ tjbench_SOURCES=tjbench.c ../common/turb
 tjbench_LDADD=$(LDADD) -lm
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common
 LDADD = ../libvncserver/libvncserver.la ../libvncclient/libvncclient.la @WSOCKLIB@
 
 if HAVE_LIBPTHREAD
Only in LibVNCServer-0.9.9/test/: Makefile.in