From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OzbCM-0004Sl-5N for garchives@archives.gentoo.org; Sat, 25 Sep 2010 20:18:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A774E076E; Sat, 25 Sep 2010 20:18:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4790EE076E for ; Sat, 25 Sep 2010 20:18:17 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E07CE1B41D5 for ; Sat, 25 Sep 2010 20:18:16 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 833) id B713E20054; Sat, 25 Sep 2010 20:18:14 +0000 (UTC) From: "Sven Wegener (swegener)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, swegener@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/x11vnc/files: x11vnc-0.9.12-warnings.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: x11vnc-0.9.12-warnings.patch X-VCS-Directories: x11-misc/x11vnc/files X-VCS-Committer: swegener X-VCS-Committer-Name: Sven Wegener Content-Type: text/plain; charset=utf8 Message-Id: <20100925201814.B713E20054@flycatcher.gentoo.org> Date: Sat, 25 Sep 2010 20:18:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 69b997e5-183a-46af-ae20-98d1873c8e01 X-Archives-Hash: ec5af2b5e6d51f697345c1b1be46ac70 swegener 10/09/25 20:18:14 Added: x11vnc-0.9.12-warnings.patch Log: Fix warnings, bug #336878 by Alexandre Ferreira. =20 (Portage version: 2.2_rc86/cvs/Linux x86_64) Revision Changes Path 1.1 x11-misc/x11vnc/files/x11vnc-0.9.12-warnings.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/fi= les/x11vnc-0.9.12-warnings.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/fi= les/x11vnc-0.9.12-warnings.patch?rev=3D1.1&content-type=3Dtext/plain Index: x11vnc-0.9.12-warnings.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -ru a/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c b/= x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c --- a/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c 2009-10= -07 15:21:23.000000000 -0500 +++ b/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c 2010-09= -11 18:49:58.100074877 -0500 @@ -393,7 +393,7 @@ CreateFileDownloadZeroSizeDataMsg(unsigned long mTime) { FileTransferMsg fileDownloadZeroSizeDataMsg; - int length =3D sz_rfbFileDownloadDataMsg + sizeof(int); + int length =3D sz_rfbFileDownloadDataMsg + sizeof(unsigned long); rfbFileDownloadDataMsg *pFDD =3D NULL; char *pFollow =3D NULL; =09 diff -ru a/x11vnc/x11vnc/remote.c b/x11vnc/x11vnc/remote.c --- a/x11vnc/x11vnc/remote.c 2010-09-09 22:46:48.000000000 -0500 +++ b/x11vnc/x11vnc/remote.c 2010-09-11 18:18:37.948074878 -0500 @@ -5825,7 +5825,7 @@ } if (!strcmp(p, "vncdisplay")) { snprintf(buf, bufn, "aro=3D%s:%s", p, - NONUL(vnc_desktop_name)); + vnc_desktop_name); goto qry; } if (!strcmp(p, "icon_mode")) { @@ -6027,7 +6027,7 @@ if (!strcmp(p, "h") || !strcmp(p, "help") || !strcmp(p, "V") || !strcmp(p, "version") || !strcmp(p, "lastmod")) { - snprintf(buf, bufn, "aro=3D%s:%s", p, NONUL(lastmod)); + snprintf(buf, bufn, "aro=3D%s:%s", p, lastmod); goto qry; } if (!strcmp(p, "bg")) { diff -ru a/x11vnc/x11vnc/sslhelper.c b/x11vnc/x11vnc/sslhelper.c --- a/x11vnc/x11vnc/sslhelper.c 2010-09-09 22:46:48.000000000 -0500 +++ b/x11vnc/x11vnc/sslhelper.c 2010-09-11 18:19:42.436074878 -0500 @@ -4004,7 +4004,7 @@ strncpy(last_get, rcookie, 100); if (db) fprintf(stderr, "last_get: '%s'\n", last_get); } - if (rcookie && strstr(rcookie, "VncViewer.class")) { + if (strstr(rcookie, "VncViewer.class")) { rfbLog("\n"); rfbLog("helper[%d]:\n", pid); rfbLog("***********************************************************\= n"); diff -ru a/x11vnc/x11vnc/userinput.c b/x11vnc/x11vnc/userinput.c --- a/x11vnc/x11vnc/userinput.c 2010-09-09 22:46:48.000000000 -0500 +++ b/x11vnc/x11vnc/userinput.c 2010-09-11 18:20:29.692074878 -0500 @@ -1305,7 +1305,7 @@ int font_size =3D 15; int win_y, scr_y, loc_cut =3D 4*font_size, y_cut =3D 10*font_size; =09 - if (!xrecord_set_by_keys || !xrecord_name_info) { + if (!xrecord_set_by_keys) { return 0; } if (xrecord_name_info[0] =3D=3D '\0') {