diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-04 00:45:54 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-04 08:46:30 +0000 |
| commit | ff9f9fc43162f3271e8335aae9b03175a0f2e7ee (patch) | |
| tree | 2a6db2a90c4a6229e1c902be890bdb52bf58f219 /epan/dissectors/packet-rtse.c | |
| parent | 321934f2ff9665f62a8ad4b2b554b457c79fd610 (diff) | |
Don't include "file.h" if you don't need it.
It ends up dragging in libwireshark headers, which programs not linking
with libwireshark shouldn't do. In particular, including
<epan/address.h> causes some functions that refer to libwireshark
functions to be defined if the compiler doesn't handle "static inline"
the way GCC does, and you end up requiring libwireshark even though you
shouldn't require it.
Move plurality() to wsutil/str_util.h, so that non-libwireshark code can
get it without include epan/packet.h. Fix includes as necessary.
Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3
Reviewed-on: https://code.wireshark.org/review/11545
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-rtse.c')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index f91406d4c6..5ba17e72d9 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -38,6 +38,8 @@ #include <epan/asn1.h> #include <epan/expert.h> +#include <wsutil/str_util.h> + #include "packet-ber.h" #include "packet-pres.h" #include "packet-acse.h" @@ -91,7 +93,7 @@ static int hf_rtse_t61String = -1; /* T_t61String */ static int hf_rtse_octetString = -1; /* T_octetString */ /*--- End of included file: packet-rtse-hf.c ---*/ -#line 58 "../../asn1/rtse/packet-rtse-template.c" +#line 60 "../../asn1/rtse/packet-rtse-template.c" /* Initialize the subtree pointers */ static gint ett_rtse = -1; @@ -108,7 +110,7 @@ static gint ett_rtse_SessionConnectionIdentifier = -1; static gint ett_rtse_CallingSSuserReference = -1; /*--- End of included file: packet-rtse-ett.c ---*/ -#line 62 "../../asn1/rtse/packet-rtse-template.c" +#line 64 "../../asn1/rtse/packet-rtse-template.c" static expert_field ei_rtse_dissector_oid_not_implemented = EI_INIT; static expert_field ei_rtse_unknown_rtse_pdu = EI_INIT; @@ -735,7 +737,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 192 "../../asn1/rtse/packet-rtse-template.c" +#line 194 "../../asn1/rtse/packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -1007,7 +1009,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 363 "../../asn1/rtse/packet-rtse-template.c" +#line 365 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1029,7 +1031,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 372 "../../asn1/rtse/packet-rtse-template.c" +#line 374 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { |