Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/x11vnc/files: x11vnc-0.9.13-warnings.patch
Date: Sun, 20 Nov 2011 01:06:04
Message-Id: 20111120003154.D24262004C@flycatcher.gentoo.org
1 radhermit 11/11/20 00:31:54
2
3 Added: x11vnc-0.9.13-warnings.patch
4 Log:
5 Version bump (bug #384407).
6
7 (Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch?rev=1.1&content-type=text/plain
14
15 Index: x11vnc-0.9.13-warnings.patch
16 ===================================================================
17 --- x11vnc-0.9.13.orig/x11vnc/remote.c
18 +++ x11vnc-0.9.13/x11vnc/remote.c
19 @@ -5860,7 +5860,7 @@
20 }
21 if (!strcmp(p, "vncdisplay")) {
22 snprintf(buf, bufn, "aro=%s:%s", p,
23 - NONUL(vnc_desktop_name));
24 + vnc_desktop_name);
25 goto qry;
26 }
27 if (!strcmp(p, "icon_mode")) {
28 @@ -6062,7 +6062,7 @@
29 if (!strcmp(p, "h") || !strcmp(p, "help") ||
30 !strcmp(p, "V") || !strcmp(p, "version") ||
31 !strcmp(p, "lastmod")) {
32 - snprintf(buf, bufn, "aro=%s:%s", p, NONUL(lastmod));
33 + snprintf(buf, bufn, "aro=%s:%s", p, lastmod);
34 goto qry;
35 }
36 if (!strcmp(p, "bg")) {
37 --- x11vnc-0.9.13.orig/x11vnc/sslhelper.c
38 +++ x11vnc-0.9.13/x11vnc/sslhelper.c
39 @@ -4041,7 +4041,7 @@
40 strncpy(last_get, rcookie, 100);
41 if (db) fprintf(stderr, "last_get: '%s'\n", last_get);
42 }
43 - if (rcookie && strstr(rcookie, "VncViewer.class")) {
44 + if (strstr(rcookie, "VncViewer.class")) {
45 rfbLog("\n");
46 rfbLog("helper[%d]:\n", pid);
47 rfbLog("***********************************************************\n");
48 --- x11vnc-0.9.13.orig/x11vnc/userinput.c
49 +++ x11vnc-0.9.13/x11vnc/userinput.c
50 @@ -1305,7 +1305,7 @@
51 int font_size = 15;
52 int win_y, scr_y, loc_cut = 4*font_size, y_cut = 10*font_size;
53
54 - if (!xrecord_set_by_keys || !xrecord_name_info) {
55 + if (!xrecord_set_by_keys) {
56 return 0;
57 }
58 if (xrecord_name_info[0] == '\0') {