osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Removed #defined preference grouping 

svn path=/trunk/; revision=24987
This commit is contained in:
Graeme Lunt 2008-04-13 16:21:08 +00:00
parent 85536e668e
commit 668e79995a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/dsp/packet-dsp-template.c
View File

@ -303,11 +303,7 @@ void proto_register_dsp(void) {
/* Register our configuration options for DSP, particularly our port */
#ifdef PREFERENCE_GROUPING
dsp_module = prefs_register_protocol_subtree("OSI/X.500", proto_dsp, prefs_register_dsp);
#else
dsp_module = prefs_register_protocol(proto_dsp, prefs_register_dsp);
#endif
prefs_register_uint_preference(dsp_module, "tcp.port", "DSP TCP Port",
"Set the port for DSP operations (if other"

8
epan/dissectors/packet-dsp.c
View File

@ -339,7 +339,7 @@ dissect_dsp_T_nameResolutionPhase(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_dsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -2564,11 +2564,7 @@ void proto_register_dsp(void) {
/* Register our configuration options for DSP, particularly our port */
#ifdef PREFERENCE_GROUPING
dsp_module = prefs_register_protocol_subtree("OSI/X.500", proto_dsp, prefs_register_dsp);
#else
dsp_module = prefs_register_protocol(proto_dsp, prefs_register_dsp);
#endif
prefs_register_uint_preference(dsp_module, "tcp.port", "DSP TCP Port",
"Set the port for DSP operations (if other"
@ -2593,7 +2589,7 @@ void proto_reg_handoff_dsp(void) {
/*--- End of included file: packet-dsp-dis-tab.c ---*/
#line 326 "packet-dsp-template.c"
#line 322 "packet-dsp-template.c"
/* APPLICATION CONTEXT */