Mon Aug 20 08:34:44 2012 UTC ()
upgrade to 1.8.2


(christos)
diff -r1.81 -r1.82 pkgsrc/net/wireshark/Makefile
diff -r1.21 -r1.22 pkgsrc/net/wireshark/PLIST
diff -r1.57 -r1.58 pkgsrc/net/wireshark/distinfo
diff -r1.10 -r1.11 pkgsrc/net/wireshark/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/net/wireshark/patches/patch-bb
cvs diff -r1.81 -r1.82 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2012/08/16 14:52:27 1.81
+++ pkgsrc/net/wireshark/Makefile 2012/08/20 08:34:43 1.82
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.81 2012/08/16 14:52:27 drochner Exp $ 1# $NetBSD: Makefile,v 1.82 2012/08/20 08:34:43 christos Exp $
2 2
3DISTNAME= wireshark-1.6.10 3DISTNAME= wireshark-1.8.2
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://www.wireshark.org/download/src/ \ 5MASTER_SITES= http://www.wireshark.org/download/src/ \
6 ${MASTER_SITE_SOURCEFORGE:=wireshark/} 6 ${MASTER_SITE_SOURCEFORGE:=wireshark/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9OWNER= tron@NetBSD.org 9OWNER= tron@NetBSD.org
10HOMEPAGE= http://www.wireshark.org/ 10HOMEPAGE= http://www.wireshark.org/
11COMMENT= Network protocol analyzer 11COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= ethereal-[0-9]* 16CONFLICTS+= ethereal-[0-9]*
cvs diff -r1.21 -r1.22 pkgsrc/net/wireshark/PLIST (expand / switch to unified diff)

--- pkgsrc/net/wireshark/PLIST 2011/11/02 07:56:24 1.21
+++ pkgsrc/net/wireshark/PLIST 2012/08/20 08:34:43 1.22
@@ -1,52 +1,44 @@ @@ -1,52 +1,44 @@
1@comment $NetBSD: PLIST,v 1.21 2011/11/02 07:56:24 tron Exp $ 1@comment $NetBSD: PLIST,v 1.22 2012/08/20 08:34:43 christos Exp $
2bin/capinfos 2bin/capinfos
3bin/dftest 3bin/dftest
4bin/dumpcap 4bin/dumpcap
5bin/editcap 5bin/editcap
6bin/idl2wrs 
7bin/mergecap 6bin/mergecap
8bin/randpkt 7bin/randpkt
9bin/rawshark 8bin/rawshark
10bin/text2pcap 9bin/text2pcap
11bin/tshark 10bin/tshark
12${PLIST.gtk2}bin/wireshark 11${PLIST.gtk2}bin/wireshark
13lib/libwireshark.la 12lib/libwireshark.la
14lib/libwiretap.la 13lib/libwiretap.la
15lib/libwsutil.la 14lib/libwsutil.la
16lib/wireshark/plugins/${PKGVERSION}/asn1.la 15lib/wireshark/plugins/${PKGVERSION}/asn1.la
17lib/wireshark/plugins/${PKGVERSION}/coseventcomm.la 
18lib/wireshark/plugins/${PKGVERSION}/cosnaming.la 
19lib/wireshark/plugins/${PKGVERSION}/docsis.la 16lib/wireshark/plugins/${PKGVERSION}/docsis.la
20lib/wireshark/plugins/${PKGVERSION}/ethercat.la 17lib/wireshark/plugins/${PKGVERSION}/ethercat.la
21lib/wireshark/plugins/${PKGVERSION}/gryphon.la 18lib/wireshark/plugins/${PKGVERSION}/gryphon.la
22lib/wireshark/plugins/${PKGVERSION}/interlink.la 
23lib/wireshark/plugins/${PKGVERSION}/irda.la 19lib/wireshark/plugins/${PKGVERSION}/irda.la
24lib/wireshark/plugins/${PKGVERSION}/m2m.la 20lib/wireshark/plugins/${PKGVERSION}/m2m.la
25lib/wireshark/plugins/${PKGVERSION}/mate.la 21lib/wireshark/plugins/${PKGVERSION}/mate.la
26lib/wireshark/plugins/${PKGVERSION}/opcua.la 22lib/wireshark/plugins/${PKGVERSION}/opcua.la
27lib/wireshark/plugins/${PKGVERSION}/parlay.la 
28lib/wireshark/plugins/${PKGVERSION}/profinet.la 23lib/wireshark/plugins/${PKGVERSION}/profinet.la
29lib/wireshark/plugins/${PKGVERSION}/sercosiii.la 
30lib/wireshark/plugins/${PKGVERSION}/stats_tree.la 24lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
31lib/wireshark/plugins/${PKGVERSION}/tango.la 
32lib/wireshark/plugins/${PKGVERSION}/unistim.la 25lib/wireshark/plugins/${PKGVERSION}/unistim.la
33lib/wireshark/plugins/${PKGVERSION}/wimax.la 26lib/wireshark/plugins/${PKGVERSION}/wimax.la
34lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la 27lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
35man/man1/capinfos.1 28man/man1/capinfos.1
36man/man1/dftest.1 29man/man1/dftest.1
37man/man1/dumpcap.1 30man/man1/dumpcap.1
38man/man1/editcap.1 31man/man1/editcap.1
39man/man1/idl2wrs.1 
40man/man1/mergecap.1 32man/man1/mergecap.1
41man/man1/randpkt.1 33man/man1/randpkt.1
42man/man1/rawshark.1 34man/man1/rawshark.1
43man/man1/text2pcap.1 35man/man1/text2pcap.1
44man/man1/tshark.1 36man/man1/tshark.1
45${PLIST.gtk2}man/man1/wireshark.1 37${PLIST.gtk2}man/man1/wireshark.1
46man/man4/wireshark-filter.4 38man/man4/wireshark-filter.4
47share/wireshark/AUTHORS-SHORT 39share/wireshark/AUTHORS-SHORT
48share/wireshark/COPYING 40share/wireshark/COPYING
49share/wireshark/capinfos.html 41share/wireshark/capinfos.html
50share/wireshark/cfilters 42share/wireshark/cfilters
51share/wireshark/colorfilters 43share/wireshark/colorfilters
52${PLIST.lua}share/wireshark/console.lua 44${PLIST.lua}share/wireshark/console.lua
@@ -82,27 +74,26 @@ share/wireshark/dtds/rss.dtd @@ -82,27 +74,26 @@ share/wireshark/dtds/rss.dtd
82share/wireshark/dtds/smil.dtd 74share/wireshark/dtds/smil.dtd
83share/wireshark/dtds/watcherinfo.dtd 75share/wireshark/dtds/watcherinfo.dtd
84share/wireshark/dtds/xcap-caps.dtd 76share/wireshark/dtds/xcap-caps.dtd
85share/wireshark/dtds/xcap-error.dtd 77share/wireshark/dtds/xcap-error.dtd
86share/wireshark/dumpcap.html 78share/wireshark/dumpcap.html
87share/wireshark/editcap.html 79share/wireshark/editcap.html
88share/wireshark/help/capture_filters.txt 80share/wireshark/help/capture_filters.txt
89share/wireshark/help/capturing.txt 81share/wireshark/help/capturing.txt
90share/wireshark/help/display_filters.txt 82share/wireshark/help/display_filters.txt
91share/wireshark/help/faq.txt 83share/wireshark/help/faq.txt
92share/wireshark/help/getting_started.txt 84share/wireshark/help/getting_started.txt
93share/wireshark/help/overview.txt 85share/wireshark/help/overview.txt
94share/wireshark/help/toc 86share/wireshark/help/toc
95share/wireshark/idl2wrs.html 
96${PLIST.lua}share/wireshark/init.lua 87${PLIST.lua}share/wireshark/init.lua
97share/wireshark/ipmap.html 88share/wireshark/ipmap.html
98share/wireshark/manuf 89share/wireshark/manuf
99share/wireshark/mergecap.html 90share/wireshark/mergecap.html
100share/wireshark/pdml2html.xsl 91share/wireshark/pdml2html.xsl
101share/wireshark/radius/README.radius_dictionary 92share/wireshark/radius/README.radius_dictionary
102share/wireshark/radius/dictionary 93share/wireshark/radius/dictionary
103share/wireshark/radius/dictionary.3com 94share/wireshark/radius/dictionary.3com
104share/wireshark/radius/dictionary.3gpp 95share/wireshark/radius/dictionary.3gpp
105share/wireshark/radius/dictionary.3gpp2 96share/wireshark/radius/dictionary.3gpp2
106share/wireshark/radius/dictionary.acc 97share/wireshark/radius/dictionary.acc
107share/wireshark/radius/dictionary.acme 98share/wireshark/radius/dictionary.acme
108share/wireshark/radius/dictionary.airespace 99share/wireshark/radius/dictionary.airespace
@@ -227,27 +218,26 @@ share/wireshark/radius/dictionary.ukerna @@ -227,27 +218,26 @@ share/wireshark/radius/dictionary.ukerna
227share/wireshark/radius/dictionary.unix 218share/wireshark/radius/dictionary.unix
228share/wireshark/radius/dictionary.usr 219share/wireshark/radius/dictionary.usr
229share/wireshark/radius/dictionary.utstarcom 220share/wireshark/radius/dictionary.utstarcom
230share/wireshark/radius/dictionary.valemount 221share/wireshark/radius/dictionary.valemount
231share/wireshark/radius/dictionary.versanet 222share/wireshark/radius/dictionary.versanet
232share/wireshark/radius/dictionary.vqp 223share/wireshark/radius/dictionary.vqp
233share/wireshark/radius/dictionary.walabi 224share/wireshark/radius/dictionary.walabi
234share/wireshark/radius/dictionary.waverider 225share/wireshark/radius/dictionary.waverider
235share/wireshark/radius/dictionary.wichorus 226share/wireshark/radius/dictionary.wichorus
236share/wireshark/radius/dictionary.wimax 227share/wireshark/radius/dictionary.wimax
237share/wireshark/radius/dictionary.wimax.wichorus 228share/wireshark/radius/dictionary.wimax.wichorus
238share/wireshark/radius/dictionary.wispr 229share/wireshark/radius/dictionary.wispr
239share/wireshark/radius/dictionary.xedia 230share/wireshark/radius/dictionary.xedia
240share/wireshark/radius/dictionary.xylan 
241share/wireshark/radius/dictionary.zyxel 231share/wireshark/radius/dictionary.zyxel
242share/wireshark/randpkt.html 232share/wireshark/randpkt.html
243share/wireshark/rawshark.html 233share/wireshark/rawshark.html
244share/wireshark/services 234share/wireshark/services
245share/wireshark/smi_modules 235share/wireshark/smi_modules
246share/wireshark/text2pcap.html 236share/wireshark/text2pcap.html
247share/wireshark/tpncp/tpncp.dat 237share/wireshark/tpncp/tpncp.dat
248share/wireshark/tshark.html 238share/wireshark/tshark.html
249share/wireshark/wimaxasncp/dictionary.dtd 239share/wireshark/wimaxasncp/dictionary.dtd
250share/wireshark/wimaxasncp/dictionary.xml 240share/wireshark/wimaxasncp/dictionary.xml
251share/wireshark/wireshark-filter.html 241share/wireshark/wireshark-filter.html
252share/wireshark/wireshark.html 242share/wireshark/wireshark.html
253share/wireshark/ws.css 243share/wireshark/ws.css
cvs diff -r1.57 -r1.58 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2012/08/16 14:52:27 1.57
+++ pkgsrc/net/wireshark/distinfo 2012/08/20 08:34:44 1.58
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.57 2012/08/16 14:52:27 drochner Exp $ 1$NetBSD: distinfo,v 1.58 2012/08/20 08:34:44 christos Exp $
2 2
3SHA1 (wireshark-1.6.10.tar.bz2) = a48ce979905d8c8506e9a4e077b6734313d9c9e0 3SHA1 (wireshark-1.8.2.tar.bz2) = 4737d9745dbf002444ea42615243abf3bb80b943
4RMD160 (wireshark-1.6.10.tar.bz2) = fa1dd90784e142eb19c06effe4009682d6ddd0bc 4RMD160 (wireshark-1.8.2.tar.bz2) = 5fece857d5187b146a690fda111a0611e108c2a9
5Size (wireshark-1.6.10.tar.bz2) = 22026939 bytes 5Size (wireshark-1.8.2.tar.bz2) = 24121798 bytes
6SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 6SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d
7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c 7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
9SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df 9SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df
10SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 10SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
11SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72 11SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e 12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
13SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 13SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
cvs diff -r1.10 -r1.11 pkgsrc/net/wireshark/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/wireshark/patches/Attic/patch-aa 2009/07/21 20:39:41 1.10
+++ pkgsrc/net/wireshark/patches/Attic/patch-aa 2012/08/20 08:34:44 1.11
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-aa,v 1.10 2009/07/21 20:39:41 tron Exp $ 1$NetBSD: patch-aa,v 1.11 2012/08/20 08:34:44 christos Exp $
2 2
3--- text2pcap.c.orig 2009-07-20 00:23:54.000000000 +0200 3--- ui/gtk/time_shift_dlg.c.orig 2012-06-05 19:33:15.000000000 +0300
4+++ text2pcap.c 4+++ ui/gtk/time_shift_dlg.c 2012-08-19 19:30:08.000000000 +0300
5@@ -90,7 +90,7 @@ 5@@ -90,6 +90,10 @@
6 # define __USE_XOPEN 6 */
7 #endif 7 static GtkWidget *time_shift_frame_w;
8 #ifndef _XOPEN_SOURCE 
9-# define _XOPEN_SOURCE 
10+# define _XOPEN_SOURCE 4 
11 #endif 
12  8
13 /* 9+#ifndef HAVE_FLOORL
 10+#define floorl(a) floor((double)(a))
 11+#endif
 12+
 13 void
 14 time_shift_cb(GtkWidget *w _U_, gpointer d _U_)
 15 {
cvs diff -r1.2 -r1.3 pkgsrc/net/wireshark/patches/Attic/patch-bb (expand / switch to unified diff)

--- pkgsrc/net/wireshark/patches/Attic/patch-bb 2011/07/20 18:42:45 1.2
+++ pkgsrc/net/wireshark/patches/Attic/patch-bb 2012/08/20 08:34:44 1.3
@@ -1,142 +1,142 @@ @@ -1,142 +1,142 @@
1$NetBSD: patch-bb,v 1.2 2011/07/20 18:42:45 tron Exp $ 1$NetBSD: patch-bb,v 1.3 2012/08/20 08:34:44 christos Exp $
2 2
3Avoid conflict with NetBSD's popcount(3). 3Avoid conflict with NetBSD's popcount(3).
4 4
5--- epan/dissectors/x11-extension-implementation.h.orig 2011-07-18 21:17:51.000000000 +0100 5--- epan/dissectors/x11-extension-implementation.h.orig 2012-06-05 19:33:36.000000000 +0300
6+++ epan/dissectors/x11-extension-implementation.h 2011-07-20 19:08:11.000000000 +0100 6+++ epan/dissectors/x11-extension-implementation.h 2012-08-19 17:16:48.000000000 +0300
7@@ -20760,8 +20760,8 @@ 7@@ -21153,8 +21153,8 @@
8 int f_namesPresent; 8 int f_namesPresent;
9 f_namesPresent = VALUE32(tvb, *offsetp + size + 4); 9 f_namesPresent = VALUE32(tvb, *offsetp + size + 4);
10 f_mapsPresent = VALUE32(tvb, *offsetp + size + 8); 10 f_mapsPresent = VALUE32(tvb, *offsetp + size + 8);
11- size += popcount(f_namesPresent) * 4; 11- size += popcount(f_namesPresent) * 4;
12- size += popcount(f_mapsPresent) * 12; 12- size += popcount(f_mapsPresent) * 12;
13+ size += my_popcount(f_namesPresent) * 4; 13+ size += my_popcount(f_namesPresent) * 4;
14+ size += my_popcount(f_mapsPresent) * 12; 14+ size += my_popcount(f_mapsPresent) * 12;
15 return size + 20; 15 return size + 20;
16 } 16 }
17  17
18@@ -20794,8 +20794,8 @@ 18@@ -21187,8 +21187,8 @@
19 f_state = VALUE32(tvb, *offsetp); 19 f_state = VALUE32(tvb, *offsetp);
20 proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, little_endian); 20 proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order);
21 *offsetp += 4; 21 *offsetp += 4;
22- listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, popcount(f_namesPresent), little_endian); 22- listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order);
23- struct_IndicatorMap(tvb, offsetp, t, little_endian, popcount(f_mapsPresent)); 23- struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent));
24+ listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, my_popcount(f_namesPresent), little_endian); 24+ listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order);
25+ struct_IndicatorMap(tvb, offsetp, t, little_endian, my_popcount(f_mapsPresent)); 25+ struct_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent));
26 } 26 }
27 } 27 }
28  28
29@@ -23093,7 +23093,7 @@ 29@@ -23502,7 +23502,7 @@
30 *offsetp += 2; 30 *offsetp += 2;
31 UNUSED(16); 31 UNUSED(16);
32 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), little_endian); 32 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), byte_order);
33- struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groupsRtrn)); 33- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
34+ struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groupsRtrn)); 34+ struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
35 } 35 }
36  36
37 static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) 37 static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
38@@ -23133,8 +23133,8 @@ 38@@ -23542,8 +23542,8 @@
39 UNUSED(2); 39 UNUSED(2);
40 listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), little_endian); 40 listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), byte_order);
41 length -= (16 * f_nSI) * 1; 41 length -= (16 * f_nSI) * 1;
42- struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groups)); 42- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups));
43- length -= popcount(f_groups) * 4; 43- length -= popcount(f_groups) * 4;
44+ struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groups)); 44+ struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups));
45+ length -= my_popcount(f_groups) * 4; 45+ length -= my_popcount(f_groups) * 4;
46 } 46 }
47  47
48 static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) 48 static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
49@@ -23229,8 +23229,8 @@ 49@@ -23638,8 +23638,8 @@
50 f_which = VALUE32(tvb, *offsetp); 50 f_which = VALUE32(tvb, *offsetp);
51 proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, little_endian); 51 proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order);
52 *offsetp += 4; 52 *offsetp += 4;
53- struct_IndicatorMap(tvb, offsetp, t, little_endian, popcount(f_which)); 53- struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
54- length -= popcount(f_which) * 12; 54- length -= popcount(f_which) * 12;
55+ struct_IndicatorMap(tvb, offsetp, t, little_endian, my_popcount(f_which)); 55+ struct_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which));
56+ length -= my_popcount(f_which) * 12; 56+ length -= my_popcount(f_which) * 12;
57 } 57 }
58  58
59 static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) 59 static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
60@@ -23727,13 +23727,13 @@ 60@@ -24136,13 +24136,13 @@
61 listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, little_endian); 61 listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, byte_order);
62 } 62 }
63 if ((f_which & (1 << 8)) != 0) { 63 if ((f_which & (1 << 8)) != 0) {
64- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); 64- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
65+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); 65+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
66 } 66 }
67 if ((f_which & (1 << 11)) != 0) { 67 if ((f_which & (1 << 11)) != 0) {
68- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); 68- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
69+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); 69+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
70 } 70 }
71 if ((f_which & (1 << 12)) != 0) { 71 if ((f_which & (1 << 12)) != 0) {
72- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), little_endian); 72- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), byte_order);
73+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); 73+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
74 } 74 }
75 if ((f_which & (1 << 9)) != 0) { 75 if ((f_which & (1 << 9)) != 0) {
76 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); 76 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
77@@ -23895,16 +23895,16 @@ 77@@ -24304,16 +24304,16 @@
78 length -= (length - 52) / 4 * 4; 78 length -= (length - 52) / 4 * 4;
79 } 79 }
80 if ((f_which & (1 << 8)) != 0) { 80 if ((f_which & (1 << 8)) != 0) {
81- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); 81- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
82- length -= popcount(f_indicators) * 4; 82- length -= popcount(f_indicators) * 4;
83+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); 83+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
84+ length -= my_popcount(f_indicators) * 4; 84+ length -= my_popcount(f_indicators) * 4;
85 } 85 }
86 if ((f_which & (1 << 11)) != 0) { 86 if ((f_which & (1 << 11)) != 0) {
87- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); 87- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
88- length -= popcount(f_virtualMods) * 4; 88- length -= popcount(f_virtualMods) * 4;
89+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); 89+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
90+ length -= my_popcount(f_virtualMods) * 4; 90+ length -= my_popcount(f_virtualMods) * 4;
91 } 91 }
92 if ((f_which & (1 << 12)) != 0) { 92 if ((f_which & (1 << 12)) != 0) {
93- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), little_endian); 93- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
94- length -= popcount(f_groupNames) * 4; 94- length -= popcount(f_groupNames) * 4;
95+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); 95+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
96+ length -= my_popcount(f_groupNames) * 4; 96+ length -= my_popcount(f_groupNames) * 4;
97 } 97 }
98 if ((f_which & (1 << 9)) != 0) { 98 if ((f_which & (1 << 9)) != 0) {
99 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); 99 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
100@@ -24693,7 +24693,7 @@ 100@@ -25102,7 +25102,7 @@
101 *offsetp += 2; 101 *offsetp += 2;
102 UNUSED(16); 102 UNUSED(16);
103 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), little_endian); 103 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), byte_order);
104- struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groupsRtrn)); 104- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
105+ struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groupsRtrn)); 105+ struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn));
106 } 106 }
107 if ((f_reported & (1 << 2)) != 0) { 107 if ((f_reported & (1 << 2)) != 0) {
108 int f_clientDeviceID; 108 int f_clientDeviceID;
109@@ -25156,13 +25156,13 @@ 109@@ -25565,13 +25565,13 @@
110 listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, little_endian); 110 listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, byte_order);
111 } 111 }
112 if ((f_which & (1 << 8)) != 0) { 112 if ((f_which & (1 << 8)) != 0) {
113- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); 113- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
114+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); 114+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
115 } 115 }
116 if ((f_which & (1 << 11)) != 0) { 116 if ((f_which & (1 << 11)) != 0) {
117- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); 117- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
118+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); 118+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
119 } 119 }
120 if ((f_which & (1 << 12)) != 0) { 120 if ((f_which & (1 << 12)) != 0) {
121- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), little_endian); 121- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
122+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); 122+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
123 } 123 }
124 if ((f_which & (1 << 9)) != 0) { 124 if ((f_which & (1 << 9)) != 0) {
125 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); 125 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
126@@ -25315,13 +25315,13 @@ 126@@ -25724,13 +25724,13 @@
127 listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, little_endian); 127 listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, byte_order);
128 } 128 }
129 if ((f_which & (1 << 8)) != 0) { 129 if ((f_which & (1 << 8)) != 0) {
130- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); 130- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
131+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); 131+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order);
132 } 132 }
133 if ((f_which & (1 << 11)) != 0) { 133 if ((f_which & (1 << 11)) != 0) {
134- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); 134- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
135+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); 135+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order);
136 } 136 }
137 if ((f_which & (1 << 12)) != 0) { 137 if ((f_which & (1 << 12)) != 0) {
138- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, popcount(f_groupNames), little_endian); 138- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
139+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); 139+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order);
140 } 140 }
141 if ((f_which & (1 << 9)) != 0) { 141 if ((f_which & (1 << 9)) != 0) {
142 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); 142 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);