diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-12-20 16:23:59 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-12-21 05:46:22 +0000 |
commit | b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000 (patch) | |
tree | 9c89dc59ef32e5b7e1cee654fdf3a30706d7aa11 /epan/dissectors/packet-xmpp-core.c | |
parent | 14cff7b6e2865efe7229f9831939fd4d241ca10c (diff) |
Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
config.h and "system" #includes.
packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
packet.h. E.g., glib.h.
(Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.
Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-xmpp-core.c')
-rw-r--r-- | epan/dissectors/packet-xmpp-core.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 41c0ac86b4..92dd573499 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -24,26 +24,20 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> - -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp-utils.h> -#include <packet-xmpp.h> -#include <packet-xmpp-core.h> -#include <packet-xmpp-jingle.h> -#include <packet-xmpp-other.h> -#include <packet-xmpp-gtalk.h> -#include <packet-xmpp-conference.h> - #include <epan/strutil.h> - -#include "epan/tvbparse.h" +#include <epan/tvbparse.h> + +#include "packet-xml.h" +#include "packet-xmpp-utils.h" +#include "packet-xmpp.h" +#include "packet-xmpp-core.h" +#include "packet-xmpp-jingle.h" +#include "packet-xmpp-other.h" +#include "packet-xmpp-gtalk.h" +#include "packet-xmpp-conference.h" tvbparse_wanted_t *want_ignore; tvbparse_wanted_t *want_stream_end_tag; |