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-idmp.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-idmp.c')
| -rw-r--r-- | epan/dissectors/packet-idmp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index 8f79096e68..192244ad10 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -40,6 +40,8 @@ #include <epan/ipproto.h> #include <epan/strutil.h> +#include <wsutil/str_util.h> + #include "packet-tcp.h" #include "packet-ber.h" @@ -171,7 +173,7 @@ static int hf_idmp_present = -1; /* INTEGER */ static int hf_idmp_absent = -1; /* NULL */ /*--- End of included file: packet-idmp-hf.c ---*/ -#line 130 "../../asn1/idmp/packet-idmp-template.c" +#line 132 "../../asn1/idmp/packet-idmp-template.c" /* Initialize the subtree pointers */ static gint ett_idmp = -1; @@ -190,7 +192,7 @@ static gint ett_idmp_Code = -1; static gint ett_idmp_InvokeId = -1; /*--- End of included file: packet-idmp-ett.c ---*/ -#line 134 "../../asn1/idmp/packet-idmp-template.c" +#line 136 "../../asn1/idmp/packet-idmp-template.c" /*--- Included file: packet-idmp-fn.c ---*/ @@ -618,7 +620,7 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U /*--- End of included file: packet-idmp-fn.c ---*/ -#line 136 "../../asn1/idmp/packet-idmp-template.c" +#line 138 "../../asn1/idmp/packet-idmp-template.c" void register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name) @@ -934,7 +936,7 @@ void proto_register_idmp(void) NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 319 "../../asn1/idmp/packet-idmp-template.c" +#line 321 "../../asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -957,7 +959,7 @@ void proto_register_idmp(void) &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 327 "../../asn1/idmp/packet-idmp-template.c" +#line 329 "../../asn1/idmp/packet-idmp-template.c" }; module_t *idmp_module; |