Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.1.1-misc-warnings.patch
Date: Sat, 22 Nov 2008 15:30:34
Message-Id: E1L3uRL-0003uh-Rk@stork.gentoo.org
1 pva 08/11/22 15:30:31
2
3 Modified: wireshark-1.1.1-misc-warnings.patch
4 Log:
5 Updated patch to handle more points of failure. Remove old.
6 (Portage version: 2.2_rc15/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)
7
8 Revision Changes Path
9 1.2 net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch?r1=1.1&r2=1.2
14
15 Index: wireshark-1.1.1-misc-warnings.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- wireshark-1.1.1-misc-warnings.patch 17 Oct 2008 10:15:20 -0000 1.1
22 +++ wireshark-1.1.1-misc-warnings.patch 22 Nov 2008 15:30:31 -0000 1.2
23 @@ -132,3 +132,29 @@
24 volatile gboolean is_802_2;
25 proto_tree *volatile vlan_tree;
26
27 +=== modified file 'epan/dissectors/packet-scsi.h'
28 +--- epan/dissectors/packet-scsi.h 2008-11-22 14:42:31 +0000
29 ++++ epan/dissectors/packet-scsi.h 2008-11-22 14:45:00 +0000
30 +@@ -241,7 +241,7 @@
31 + */
32 + #define TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, length) \
33 + { \
34 +- gboolean short_packet; \
35 ++ volatile gboolean short_packet; \
36 + tvbuff_t *new_tvb; \
37 + guint32 end_data_offset=0; \
38 + \
39 +
40 +=== modified file 'epan/dissectors/packet-x11.c'
41 +--- epan/dissectors/packet-x11.c 2008-11-22 14:42:31 +0000
42 ++++ epan/dissectors/packet-x11.c 2008-11-22 14:50:41 +0000
43 +@@ -4066,7 +4066,7 @@
44 + conversation_t *conversation;
45 + x11_conv_data_t *volatile state;
46 + int length;
47 +- tvbuff_t *next_tvb;
48 ++ tvbuff_t *volatile next_tvb;
49 +
50 + while (tvb_reported_length_remaining(tvb, offset) != 0) {
51 + /*
52 +