diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:18:40 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:18:40 +0000 |
| commit | fb3b8307e8da998e2a949c98b41d548b9d6b68a5 (patch) | |
| tree | f4b6324784f14cebaff72d867a4054a034bdcc3c /epan/dissectors/packet-disp.c | |
| parent | 9bd868fae7d0182dbc2eff4ca1d3b5296c3bab35 (diff) | |
Remove #defined preference grouping
svn path=/trunk/; revision=24985
Diffstat (limited to 'epan/dissectors/packet-disp.c')
| -rw-r--r-- | epan/dissectors/packet-disp.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 83a9c8b81b..be7b969e6f 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -546,7 +546,7 @@ dissect_disp_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_disp_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; } @@ -1428,7 +1428,7 @@ dissect_disp_ShadowProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off guint32 problem; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &problem); + &problem); if (check_col(actx->pinfo->cinfo, COL_INFO)) { @@ -2158,11 +2158,7 @@ void proto_register_disp(void) { /* Register our configuration options for DISP, particularly our port */ -#ifdef PREFERENCE_GROUPING disp_module = prefs_register_protocol_subtree("OSI/X.500", proto_disp, prefs_register_disp); -#else - disp_module = prefs_register_protocol(proto_disp, prefs_register_disp); -#endif prefs_register_uint_preference(disp_module, "tcp.port", "DISP TCP Port", "Set the port for DISP operations (if other" @@ -2187,7 +2183,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 247 "packet-disp-template.c" +#line 243 "packet-disp-template.c" /* APPLICATION CONTEXT */ |