[bugzilla-daemon@xxxxxxxxxxxxx]

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6915

--- Comment #1 from Anders Broman <anders.broman@xxxxxxxxxxxx> 2012-03-06 23:54:17 PST ---
Hi,
The patches does not apply cleanly to trunk.
patching file asn1/h248/packet-h248-template.c
Hunk #1 FAILED at 29.
Hunk #2 succeeded at 43 (offset -2 lines).
Hunk #3 succeeded at 91 (offset -2 lines).
Hunk #4 succeeded at 121 (offset -2 lines).
Hunk #5 succeeded at 344 (offset -2 lines).
Hunk #6 succeeded at 403 (offset -2 lines).
Hunk #7 succeeded at 420 (offset -2 lines).
Hunk #8 succeeded at 488 (offset -2 lines).
Hunk #9 succeeded at 529 (offset -2 lines).
Hunk #10 succeeded at 708 (offset -2 lines).
Hunk #11 FAILED at 737.
Hunk #12 succeeded at 764 (offset -4 lines).
Hunk #13 succeeded at 869 (offset -4 lines).
Hunk #14 FAILED at 1002.
Hunk #15 succeeded at 1010 (offset -6 lines).
Hunk #16 succeeded at 1049 with fuzz 2 (offset -7 lines).
Hunk #17 succeeded at 1058 (offset -8 lines).
Hunk #18 succeeded at 1114 with fuzz 2 (offset -9 lines).
Hunk #19 succeeded at 1123 (offset -10 lines).
Hunk #20 succeeded at 1210 (offset -11 lines).
Hunk #21 succeeded at 1280 (offset -12 lines).
Hunk #22 FAILED at 1361.
Hunk #23 succeeded at 1489 (offset -13 lines).
Hunk #24 succeeded at 1521 (offset -13 lines).
Hunk #25 succeeded at 1543 (offset -13 lines).
Hunk #26 succeeded at 1632 (offset -13 lines).
4 out of 26 hunks FAILED -- saving rejects to file
asn1/h248/packet-h248-templat
e.c.rej
patching file asn1/h248/h248v1support.asn
patching file asn1/h248/packet-h248-template.h
patching file asn1/h248/h248.cnf
Hunk #2 succeeded at 83 with fuzz 2.
Hunk #5 FAILED at 357.
Hunk #6 FAILED at 385.
2 out of 6 hunks FAILED -- saving rejects to file asn1/h248/h248.cnf.rej
patching file epan/libwireshark.def
Hunk #1 succeeded at 611 (offset 13 lines).
patching file epan/dissectors/packet-h248_3gpp.c
patching file epan/dissectors/packet-h248_annex_c.c
patching file epan/dissectors/packet-h248_q1950.c
patching file epan/dissectors/packet-h248_annex_e.c
Hunk #3 FAILED at 117.
1 out of 13 hunks FAILED -- saving rejects to file
epan/dissectors/packet-h248_a
nnex_e.c.rej
patching file epan/dissectors/packet-h248_10.c

Trying to apply by hand I get the following errors at compile(could be my
fault).

packet-h248_3gpp.c
packet-h248_7.c
packet-h248_10.c
packet-h248_10.c(110) : error C2220: warning treated as error - no 'object'
file
 generated
packet-h248_10.c(110) : warning C4090: 'function' : different 'const'
qualifiers

packet-h248_annex_c.c
packet-h248_3gpp.c(581) : error C2220: warning treated as error - no 'object'
fi
le generated
packet-h248_3gpp.c(581) : warning C4090: 'function' : different 'const'
qualifie
rs
packet-h248_3gpp.c(582) : warning C4090: 'function' : different 'const'
qualifie
rs
packet-h248_3gpp.c(583) : warning C4090: 'function' : different 'const'
qualifie
rs
packet-h248_annex_e.c
packet-h248_7.c(176) : error C2220: warning treated as error - no 'object' file
generated
packet-h248_7.c(176) : warning C4090: 'function' : different 'const' qualifiers
packet-h248_q1950.c
packet-h248.c
packet-h248_annex_e.c(240) : error C2065: 'h248_pkg_dg_props_vals' : undeclared
identifier
packet-h248_annex_e.c(240) : error C2099: initializer is not a constant
packet-h248_annex_e.c(243) : warning C4133: 'initializing' : incompatible types
- from 'h248_pkg_sig_t *' to 'const h248_pkg_param_t *'
packet-h248_annex_e.c(329) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(330) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(335) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(336) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(337) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(425) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(426) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(427) : error C2065: 'implicit' : undeclared identifier
packet-h248_annex_e.c(741) : error C2065: 'hf_h248_pkg_tonegen' : undeclared
ide
ntifier
packet-h248_annex_e.c(742) : error C2065: 'hf_h248_pkg_tonegen_sig_pt' :
undecla
red identifier
packet-h248_annex_e.c(743) : error C2065: 'hf_h248_pkg_tonegen_sig_pt_tl' :
unde
clared identifier
packet-h248_annex_e.c(744) : error C2065: 'hf_h248_pkg_tonegen_sig_pt_ind' :
und
eclared identifier
packet-h248_annex_e.c(745) : error C2065: 'hf_h248_pkg_tonegen_sig_pg_btd' :
und
eclared identifier
packet-h248_annex_e.c(745) : error C2065: 'h248_pkg_tonegen_pt_btd_param_vals'
:
 undeclared identifier
packet-h248_annex_e.c(745) : error C2099: initializer is not a constant
packet-h248_annex_e.c(745) : warning C4047: 'initializing' : 'guint32' differs
i
n levels of indirection from 'void *'
packet-h248_annex_e.c(745) : warning C4047: 'initializing' : 'int' differs in
le
vels of indirection from 'void *'
packet-h248_annex_e.c(748) : error C2065: 'hf_h248_pkg_tonedet' : undeclared
ide
ntifier
packet-h248_annex_e.c(749) : error C2065: 'hf_h248_pkg_tonedet_evt_std' :
undecl
ared identifier
packet-h248_annex_e.c(750) : error C2065: 'hf_h248_pkg_tonedet_evt_etd' :
undecl
ared identifier
packet-h248_annex_e.c(751) : error C2065: 'hf_h248_pkg_tonedet_evt_ltd' :
undecl
ared identifier
packet-h248_annex_e.c(752) : error C2065: 'hf_h248_pkg_tonedet_evt_tl_param' :
u
ndeclared identifier
packet-h248_annex_e.c(752) : error C2065: 'h248_pkg_tonedet_tl_params_vals' :
un
declared identifier
packet-h248_annex_e.c(752) : error C2099: initializer is not a constant
packet-h248_annex_e.c(752) : warning C4047: 'initializing' : 'guint32' differs
i
n levels of indirection from 'void *'
packet-h248_annex_e.c(752) : warning C4047: 'initializing' : 'int' differs in
le
vels of indirection from 'void *'
packet-h248_annex_e.c(753) : error C2065: 'hf_h248_pkg_tonedet_evt_dur_param' :
undeclared identifier
packet-h248_annex_e.c(754) : error C2065: 'hf_h248_pkg_tonedet_evt_tid_param' :
undeclared identifier
packet-h248_annex_e.c(754) : error C2065: 'h248_pkg_tonedet_tl_params_vals' :
un
declared identifier
packet-h248_annex_e.c(754) : error C2099: initializer is not a constant
packet-h248_annex_e.c(754) : warning C4047: 'initializing' : 'guint32' differs
i
n levels of indirection from 'void *'
packet-h248_annex_e.c(754) : warning C4047: 'initializing' : 'int' differs in
le
vels of indirection from 'void *'
packet-h248_annex_e.c(759) : error C2065: 'hf_h248_pkg_dg_sig_pt' : undeclared
i
dentifier
packet-h248_annex_e.c(764) : error C2065: 'hf_h248_pkg_dg_sig_d4' : undeclared
i
dentifier
packet-h248_annex_e.c(765) : error C2065: 'hf_h248_pkg_dg_sig_d5' : undeclared
i
dentifier
packet-h248_annex_e.c(766) : error C2065: 'hf_h248_pkg_dg_sig_d6' : undeclared
i
dentifier
packet-h248_annex_e.c(767) : error C2065: 'hf_h248_pkg_dg_sig_d7' : undeclared
i
dentifier
packet-h248_annex_e.c(768) : error C2065: 'hf_h248_pkg_dg_sig_d8' : undeclared
i
dentifier
packet-h248_annex_e.c(769) : error C2065: 'hf_h248_pkg_dg_sig_d9' : undeclared
i
dentifier
packet-h248_annex_e.c(770) : error C2065: 'hf_h248_pkg_dg_sig_da' : undeclared
i
dentifier
packet-h248_annex_e.c(771) : error C2065: 'hf_h248_pkg_dg_sig_db' : undeclared
i
dentifier
packet-h248_annex_e.c(772) : error C2065: 'hf_h248_pkg_dg_sig_dc' : undeclared
i
dentifier
packet-h248_annex_e.c(773) : error C2065: 'hf_h248_pkg_dg_sig_dd' : undeclared
i
dentifier
packet-h248_annex_e.c(774) : error C2065: 'hf_h248_pkg_dg_sig_ds' : undeclared
i
dentifier
packet-h248_annex_e.c(775) : error C2065: 'hf_h248_pkg_dg_sig_do' : undeclared
i
dentifier
packet-h248_annex_e.c(776) : error C2065: 'hf_h248_pkg_dg_sig_params' :
undeclar
ed identifier
packet-h248_annex_e.c(776) : error C2065: 'h248_pkg_dg_sig_btd_vals' :
undeclare
d identifier
packet-h248_annex_e.c(776) : error C2099: initializer is not a constant
packet-h248_annex_e.c(776) : warning C4047: 'initializing' : 'guint32' differs
i
n levels of indirection from 'void *'
packet-h248_annex_e.c(776) : warning C4047: 'initializing' : 'int' differs in
le
vels of indirection from 'void *'
packet-h248_annex_e.c(831) : error C2065: 'ett_h248_pkg_root_params' :
undeclare
d identifier
packet-h248_annex_e.c(833) : error C2065: 'ett_h248_pkg_tonegen_params' :
undecl
ared identifier
packet-h248_annex_e.c(836) : error C2065: 'ett_h248_pkg_tonedet' : undeclared
id
entifier
packet-h248_annex_e.c(837) : error C2065: 'ett_h248_pkg_tonedet_evt_std' :
undec
lared identifier
packet-h248_annex_e.c(838) : error C2065: 'ett_h248_pkg_tonedet_evt_etd' :
undec
lared identifier
packet-h248_annex_e.c(839) : error C2065: 'ett_h248_pkg_tonedet_evt_ltd' :
undec
lared identifier
packet-h248_annex_e.c(843) : error C2065: 'ett_h248_pkg_dg_sig_pt' : undeclared
identifier
packet-h248_annex_e.c(848) : error C2065: 'ett_h248_pkg_dg_sig_d4' : undeclared
identifier
packet-h248_annex_e.c(849) : error C2065: 'ett_h248_pkg_dg_sig_d5' : undeclared
identifier
packet-h248_annex_e.c(850) : error C2065: 'ett_h248_pkg_dg_sig_d6' : undeclared
identifier
packet-h248_annex_e.c(851) : error C2065: 'ett_h248_pkg_dg_sig_d7' : undeclared
identifier
packet-h248_annex_e.c(852) : error C2065: 'ett_h248_pkg_dg_sig_d8' : undeclared
identifier
packet-h248_annex_e.c(853) : error C2065: 'ett_h248_pkg_dg_sig_d9' : undeclared
identifier
packet-h248_annex_e.c(854) : error C2065: 'ett_h248_pkg_dg_sig_da' : undeclared
identifier
packet-h248_annex_e.c(855) : error C2065: 'ett_h248_pkg_dg_sig_db' : undeclared
identifier
packet-h248_annex_e.c(856) : error C2065: 'ett_h248_pkg_dg_sig_dc' : undeclared
identifier
packet-h248_annex_e.c(857) : error C2065: 'ett_h248_pkg_dg_sig_dd' : undeclared
identifier
packet-h248_annex_e.c(858) : error C2065: 'ett_h248_pkg_dg_sig_ds' : undeclared
identifier
packet-h248_annex_e.c(859) : error C2065: 'ett_h248_pkg_dg_sig_do' : undeclared
identifier
packet-h248_annex_e.c(871) : error C2065: 'ett_h248_pkg_tonegen_sig_pt' :
undecl
ared identifier
packet-h248_annex_e.c(913) : error C2065: 'h248_pkg_root' : undeclared
identifie
r
packet-h248_annex_e.c(913) : warning C4133: 'function' : incompatible types -
fr
om 'int *' to 'h248_package_t *'
packet-h248_annex_e.c(914) : error C2065: 'h248_pkg_tonegen' : undeclared
identi
fier
packet-h248_annex_e.c(914) : warning C4133: 'function' : incompatible types -
fr
om 'int *' to 'h248_package_t *'
packet-h248_annex_e.c(915) : error C2065: 'h248_pkg_tonedet' : undeclared
identi
fier
packet-h248_annex_e.c(915) : warning C4133: 'function' : incompatible types -
fr
om 'int *' to 'h248_package_t *'
../../asn1/h248/packet-h248-template.c(884) : error C2220: warning treated as
er
ror - no 'object' file generated
../../asn1/h248/packet-h248-template.c(884) : warning C4090: 'return' :
differen
t 'const' qualifiers
../../asn1/h248/packet-h248-template.c(917) : warning C4090: '=' : different
'co
nst' qualifiers
../../asn1/h248/packet-h248-template.c(1301) : error C2037: left of 'tvbuffs'
sp
ecifies undefined struct/union 'tvbuff'
../../asn1/h248/packet-h248-template.c(1382) : error C2065: 'old_offset' :
undec
lared identifier
../../asn1/h248/packet-h248-template.c(1392) : error C2065: 'old_offset' :
undec
lared identifier
../../asn1/h248/packet-h248-template.c(1407) : error C2037: left of 'tvbuffs'
sp
ecifies undefined struct/union 'tvbuff'
../../asn1/h248/h248.cnf(406) : error C2065: 'len' : undeclared identifier
../../asn1/h248/h248.cnf(406) : error C2099: initializer is not a constant
../../asn1/h248/h248.cnf(410) : error C2059: syntax error : 'return'
../../asn1/h248/h248.cnf(411) : error C2059: syntax error : '}'
../../asn1/h248/packet-h248-template.c(1635) : error C2065: 'dissect_h248_tpkt'
: undeclared identifier
../../asn1/h248/packet-h248-template.c(1635) : warning C4047: 'function' :
'diss
ector_t' differs in levels of indirection from 'int'
../../asn1/h248/packet-h248-template.c(1635) : warning C4024:
'register_dissecto
r' : different types for formal and actual parameter 2
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio
10.0
\VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio
10.0
\VC\BIN\nmake.exe"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio
10.0
\VC\BIN\nmake.exe"' : return code '0x2'
Stop.

Regards
Anders

-- 
Configure bugmail: https://bugs.wireshark.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.