diff options
46 files changed, 105 insertions, 108 deletions
diff --git a/capture_info.h b/capture_info.h index cbd13336c0..46bd72aade 100644 --- a/capture_info.h +++ b/capture_info.h @@ -79,6 +79,8 @@ capture_info *cinfo); } #endif /* __cplusplus */ +#endif /* capture_info.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -91,5 +93,3 @@ capture_info *cinfo); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* capture_info.h */ diff --git a/capture_opts.h b/capture_opts.h index bccd8f764e..cfbe53360e 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -372,6 +372,8 @@ collect_ifaces(capture_options *capture_opts); } #endif /* __cplusplus */ +#endif /* capture_opts.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -384,5 +386,3 @@ collect_ifaces(capture_options *capture_opts); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* capture_opts.h */ @@ -138,6 +138,8 @@ extern const char *cap_file_get_interface_name(void *data, guint32 interface_id) } #endif /* __cplusplus */ +#endif /* cfile.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -147,8 +149,6 @@ extern const char *cap_file_get_interface_name(void *data, guint32 interface_id) * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* cfile.h */ @@ -58,6 +58,8 @@ gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 bl } #endif /* __cplusplus */ +#endif /* __COLOR_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -70,5 +72,3 @@ gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 bl * vi: set shiftwidth=8 tabstop=8 noexpandtab: * :indentSize=8:tabSize=8:noTabs=false: */ - -#endif /* __COLOR_H__ */ diff --git a/conditions.h b/conditions.h index 262c478476..4ff2613313 100644 --- a/conditions.h +++ b/conditions.h @@ -129,6 +129,8 @@ void* cnd_get_user_data(condition*); */ void cnd_set_user_data(condition *, void *); +#endif /* CONDITIONS_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -141,5 +143,3 @@ void cnd_set_user_data(condition *, void *); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* CONDITIONS_H */ diff --git a/epan/dissectors/packet-bssgp.h b/epan/dissectors/packet-bssgp.h index 7761ddf0ba..32e7ceebe0 100644 --- a/epan/dissectors/packet-bssgp.h +++ b/epan/dissectors/packet-bssgp.h @@ -34,6 +34,8 @@ guint16 de_bssgp_cell_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gu guint16 de_bssgp_source_BSS_to_target_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len); guint16 de_bssgp_target_BSS_to_source_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len); +#endif /* __PACKET_BSSGP_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -46,5 +48,3 @@ guint16 de_bssgp_target_BSS_to_source_BSS_transp_cont(tvbuff_t *tvb, proto_tree * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __PACKET_BSSGP_H__ */ diff --git a/epan/dissectors/packet-corosync-totemnet.c b/epan/dissectors/packet-corosync-totemnet.c index 9924e7d5a1..8c43e4af22 100644 --- a/epan/dissectors/packet-corosync-totemnet.c +++ b/epan/dissectors/packet-corosync-totemnet.c @@ -514,5 +514,3 @@ proto_reg_handoff_corosync_totemnet(void) * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -/* packet-corosync-totemnet.c ends here */ diff --git a/epan/dissectors/packet-csn1.h b/epan/dissectors/packet-csn1.h index 47240fa83d..058cde0c13 100644 --- a/epan/dissectors/packet-csn1.h +++ b/epan/dissectors/packet-csn1.h @@ -645,6 +645,8 @@ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); #define CSNDESCR(_FuncType) CSNDESCR_##_FuncType +#endif /*_PACKET_CSN1_H_*/ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -654,8 +656,6 @@ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /*_PACKET_CSN1_H_*/ diff --git a/epan/dissectors/packet-e212.h b/epan/dissectors/packet-e212.h index a746ae56ce..c8e5110150 100644 --- a/epan/dissectors/packet-e212.h +++ b/epan/dissectors/packet-e212.h @@ -63,6 +63,8 @@ const gchar * dissect_e212_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t WS_DLL_PUBLIC const gchar * dissect_e212_utf8_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int length); +#endif /* __PACKET_E212_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -75,5 +77,3 @@ const gchar * dissect_e212_utf8_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tr * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __PACKET_E212_H__ */ diff --git a/epan/dissectors/packet-gsm_rlcmac.h b/epan/dissectors/packet-gsm_rlcmac.h index 78597d5be5..c3bd021d1e 100644 --- a/epan/dissectors/packet-gsm_rlcmac.h +++ b/epan/dissectors/packet-gsm_rlcmac.h @@ -5244,6 +5244,8 @@ extern const guint8 gsm_rlcmac_egprs_header_type_to_dl_header_block_length[]; extern const guint8 gsm_rlcmac_egprs_header_type_to_ul_header_block_length[]; extern const guint8 gsm_rlcmac_egprs_mcs_to_data_block_length[]; +#endif /* __PACKET_GSM_RLCMAC_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -5253,8 +5255,6 @@ extern const guint8 gsm_rlcmac_egprs_mcs_to_data_block_length[]; * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* __PACKET_GSM_RLCMAC_H__ */ diff --git a/epan/dissectors/packet-sctp.h b/epan/dissectors/packet-sctp.h index 0bd5ede862..237145b8e0 100644 --- a/epan/dissectors/packet-sctp.h +++ b/epan/dissectors/packet-sctp.h @@ -77,6 +77,8 @@ typedef struct _sctp_frag_msg { struct _sctp_frag_msg* next; } sctp_frag_msg; +#endif + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -86,8 +88,6 @@ typedef struct _sctp_frag_msg { * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif diff --git a/epan/dissectors/packet-ses.h b/epan/dissectors/packet-ses.h index 4d1dc29a64..225635273c 100644 --- a/epan/dissectors/packet-ses.h +++ b/epan/dissectors/packet-ses.h @@ -207,6 +207,8 @@ struct SESSION_DATA_STRUCTURE extern value_string_ext ses_vals_ext; +#endif + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -219,5 +221,3 @@ extern value_string_ext ses_vals_ext; * vi: set shiftwidth=8 tabstop=8 noexpandtab: * :indentSize=8:tabSize=8:noTabs=false: */ - -#endif diff --git a/epan/dissectors/packet-zbee-aps.h b/epan/dissectors/packet-zbee-aps.h index 48991f9765..ba37a8fe6d 100644 --- a/epan/dissectors/packet-zbee-aps.h +++ b/epan/dissectors/packet-zbee-aps.h @@ -272,6 +272,8 @@ typedef struct{ extern const value_string zbee_aps_cid_names[]; +#endif /* PACKET_ZBEE_APS_H*/ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -284,5 +286,3 @@ extern const value_string zbee_aps_cid_names[]; * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* PACKET_ZBEE_APS_H*/ diff --git a/epan/dissectors/packet-zbee-nwk.h b/epan/dissectors/packet-zbee-nwk.h index 18838057e3..0ee3c283c0 100644 --- a/epan/dissectors/packet-zbee-nwk.h +++ b/epan/dissectors/packet-zbee-nwk.h @@ -203,6 +203,8 @@ extern GHashTable *zbee_table_link_keyring; #define ZBEE_IP_BEACON_TLV_TYPE_MASK 0xf0 #define ZBEE_IP_BEACON_TLV_TYPE_LFDI 0x0 +#endif /* PACKET_ZBEE_NWK_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -215,6 +217,3 @@ extern GHashTable *zbee_table_link_keyring; * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* PACKET_ZBEE_NWK_H */ - diff --git a/epan/dissectors/packet-zbee-security.h b/epan/dissectors/packet-zbee-security.h index 61457b87c9..9818392806 100644 --- a/epan/dissectors/packet-zbee-security.h +++ b/epan/dissectors/packet-zbee-security.h @@ -80,6 +80,8 @@ extern void zbee_security_handoff (void); extern tvbuff_t *dissect_zbee_secure(tvbuff_t *, packet_info *, proto_tree *, guint); extern gboolean zbee_sec_ccm_decrypt(const gchar *, const gchar *, const gchar *, const gchar *, gchar *, guint, guint, guint); +#endif /* PACKET_ZBEE_SECURITY_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -92,5 +94,3 @@ extern gboolean zbee_sec_ccm_decrypt(const gchar *, const gchar *, const gchar * * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* PACKET_ZBEE_SECURITY_H */ diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h index 691882f154..35bf77a806 100644 --- a/epan/dissectors/packet-zbee-zdp.h +++ b/epan/dissectors/packet-zbee-zdp.h @@ -388,6 +388,8 @@ extern void zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *o extern const value_string zbee_zdp_cluster_names[]; extern const value_string zbee_zdp_rtg_status_vals[]; +#endif /* PACKET_ZBEE_ZDP_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -400,5 +402,3 @@ extern const value_string zbee_zdp_rtg_status_vals[]; * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* PACKET_ZBEE_ZDP_H */ diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index 80ac7a74d5..eb145c3ead 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -806,6 +806,8 @@ /* Helper Functions */ extern guint zbee_get_bit_field(guint input, guint mask); +#endif /* PACKET_ZBEE_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -818,5 +820,3 @@ extern guint zbee_get_bit_field(guint input, guint mask); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* PACKET_ZBEE_H */ diff --git a/epan/frequency-utils.h b/epan/frequency-utils.h index 75eed76b55..10603e06d7 100644 --- a/epan/frequency-utils.h +++ b/epan/frequency-utils.h @@ -60,6 +60,8 @@ ieee80211_mhz_to_str(guint freq); /* Should this be "(freq < 4920)", or something else? */ #define FREQ_IS_BG(freq) (freq <= 2484) +#endif /* __FREQUENCY_UTILS_H__ */ + /* * Editor modelines * @@ -69,9 +71,6 @@ ieee80211_mhz_to_str(guint freq); * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=4 tabstop=8 expandtab: + * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __FREQUENCY_UTILS_H__ */ - diff --git a/epan/stats_tree.h b/epan/stats_tree.h index 0e06cccc50..15a150e6d3 100644 --- a/epan/stats_tree.h +++ b/epan/stats_tree.h @@ -233,6 +233,8 @@ WS_DLL_PUBLIC int stats_tree_manip_node(manip_node_mode mode, #define stat_node_clear_flags(st,name,parent_id,with_children,flags) \ (stats_tree_manip_node(MN_CLEAR_FLAGS,(st),(name),(parent_id),(with_children),flags)) +#endif /* __STATS_TREE_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -245,5 +247,3 @@ WS_DLL_PUBLIC int stats_tree_manip_node(manip_node_mode mode, * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __STATS_TREE_H */ @@ -682,6 +682,8 @@ void read_keytab_file(const char *); } #endif /* __cplusplus */ +#endif /* file.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -694,5 +696,3 @@ void read_keytab_file(const char *); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* file.h */ @@ -63,6 +63,8 @@ extern void fileset_update_file(const char *path); } #endif /* __cplusplus */ +#endif /* __FILESET_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -75,5 +77,3 @@ extern void fileset_update_file(const char *path); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __FILESET_H__ */ diff --git a/frame_tvbuff.h b/frame_tvbuff.h index 47b4641b50..3f906e9b41 100644 --- a/frame_tvbuff.h +++ b/frame_tvbuff.h @@ -41,6 +41,8 @@ extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf); } #endif /* __cplusplus */ +#endif /* __FRAME_TVBUFF_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -53,5 +55,3 @@ extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf); * vi: set shiftwidth=8 tabstop=8 noexpandtab: * :indentSize=8:tabSize=8:noTabs=false: */ - -#endif /* __FRAME_TVBUFF_H__ */ @@ -36,6 +36,8 @@ extern capture_file cfile; } #endif /* __cplusplus */ +#endif /* __GLOBALS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -48,5 +50,3 @@ extern capture_file cfile; * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __GLOBALS_H__ */ @@ -36,6 +36,8 @@ /* (might slightly degrade performance) */ /*#define LOG_CAPTURE_VERBOSE*/ +#endif + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -48,5 +50,3 @@ * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index 5bc07d78d2..234a15cdab 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -116,6 +116,9 @@ void proto_reg_handoff_ioraw(void) ioraw_handle = create_dissector_handle(dissect_ioraw, proto_ioraw); + dissector_add_uint("ecatf.type", 3, ioraw_handle); +} + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -125,8 +128,6 @@ void proto_reg_handoff_ioraw(void) * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=3 tabstop=8 expandtab: + * vi: set shiftwidth=3 tabstop=8 expandtab: * :indentSize=3:tabSize=8:noTabs=true: */ - dissector_add_uint("ecatf.type", 3, ioraw_handle); -} diff --git a/register.h b/register.h index 1bc023de5d..b70c41d8f1 100644 --- a/register.h +++ b/register.h @@ -57,6 +57,8 @@ WS_DLL_PUBLIC gulong register_count(void); } #endif /* __cplusplus */ +#endif /* __REGISTER_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -66,8 +68,6 @@ WS_DLL_PUBLIC gulong register_count(void); * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* __REGISTER_H__ */ diff --git a/ringbuffer.h b/ringbuffer.h index d506ed3277..ca322ae8a1 100644 --- a/ringbuffer.h +++ b/ringbuffer.h @@ -45,6 +45,8 @@ gboolean ringbuf_libpcap_dump_close(gchar **save_file, int *err); void ringbuf_free(void); void ringbuf_error_cleanup(void); +#endif /* ringbuffer.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -54,8 +56,6 @@ void ringbuf_error_cleanup(void); * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* ringbuffer.h */ @@ -97,6 +97,8 @@ summary_fill_in_capture(capture_file *cf, capture_options *capture_opts, summary } #endif /* __cplusplus */ +#endif /* summary.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -106,8 +108,6 @@ summary_fill_in_capture(capture_file *cf, capture_options *capture_opts, summary * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* summary.h */ diff --git a/sync_pipe.h b/sync_pipe.h index 2a846a1c2c..2cef98ec8c 100644 --- a/sync_pipe.h +++ b/sync_pipe.h @@ -86,6 +86,8 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg, #define SIGNAL_PIPE_FORMAT "\\\\.\\pipe\\wireshark.%s.signal" #endif +#endif /* sync_pipe.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -98,5 +100,3 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg, * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* sync_pipe.h */ diff --git a/text2pcap.h b/text2pcap.h index 60d953f6d4..964d5d22d4 100644 --- a/text2pcap.h +++ b/text2pcap.h @@ -44,6 +44,8 @@ void parse_token(token_t token, char *str); int yylex(void); +#endif + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -56,5 +58,3 @@ int yylex(void); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif diff --git a/ui/capture.h b/ui/capture.h index f29d99f64b..6407e4b2d8 100644 --- a/ui/capture.h +++ b/ui/capture.h @@ -105,6 +105,8 @@ void capture_stat_stop(if_stat_cache_t *sc); } #endif /* __cplusplus */ +#endif /* capture.h */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -114,8 +116,6 @@ void capture_stat_stop(if_stat_cache_t *sc); * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* capture.h */ diff --git a/ui/capture_ui_utils.h b/ui/capture_ui_utils.h index 211f805b03..5931086bba 100644 --- a/ui/capture_ui_utils.h +++ b/ui/capture_ui_utils.h @@ -123,6 +123,8 @@ const char *get_iface_description_for_interface(capture_options *capture_opts, g } #endif /* __cplusplus */ +#endif /* __CAPTURE_UI_UTILS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -132,8 +134,6 @@ const char *get_iface_description_for_interface(capture_options *capture_opts, g * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* __CAPTURE_UI_UTILS_H__ */ diff --git a/ui/decode_as_utils.h b/ui/decode_as_utils.h index f6b86b4022..bc00881644 100644 --- a/ui/decode_as_utils.h +++ b/ui/decode_as_utils.h @@ -77,6 +77,8 @@ void decode_clear_all(void); } #endif /* __cplusplus */ +#endif /* __DECODE_AS_UTILS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -89,5 +91,3 @@ void decode_clear_all(void); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __DECODE_AS_UTILS_H__ */ diff --git a/ui/filters.h b/ui/filters.h index 38e361867f..330150f515 100644 --- a/ui/filters.h +++ b/ui/filters.h @@ -93,6 +93,8 @@ void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type) } #endif /* __cplusplus */ +#endif /* __UI_FILTERS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -102,8 +104,6 @@ void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type) * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* __UI_FILTERS_H__ */ diff --git a/ui/persfilepath_opt.h b/ui/persfilepath_opt.h index 03555800a4..0edd5e57a0 100644 --- a/ui/persfilepath_opt.h +++ b/ui/persfilepath_opt.h @@ -39,6 +39,8 @@ extern gboolean persfilepath_opt(int opt, const char *optstr); } #endif /* __cplusplus */ +#endif /* PERSFILEPATH_OPT_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -51,5 +53,3 @@ extern gboolean persfilepath_opt(int opt, const char *optstr); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* PERSFILEPATH_OPT_H */ diff --git a/ui/preference_utils.h b/ui/preference_utils.h index 098bcbc600..c60b32c13a 100644 --- a/ui/preference_utils.h +++ b/ui/preference_utils.h @@ -108,6 +108,8 @@ void column_prefs_remove_nth(gint col); } #endif /* __cplusplus */ +#endif /* __PREFRENCE_UTILS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -117,8 +119,6 @@ void column_prefs_remove_nth(gint col); * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* __PREFRENCE_UTILS_H__ */ diff --git a/ui/profile.h b/ui/profile.h index f3295306dd..6d4d26a887 100644 --- a/ui/profile.h +++ b/ui/profile.h @@ -128,6 +128,8 @@ gboolean delete_current_profile(void); } #endif /* __cplusplus */ +#endif /* __PROFILE_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -140,5 +142,3 @@ gboolean delete_current_profile(void); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __PROFILE_H__ */ diff --git a/ui/proto_hier_stats.h b/ui/proto_hier_stats.h index dd10903971..c3ba23b8a0 100644 --- a/ui/proto_hier_stats.h +++ b/ui/proto_hier_stats.h @@ -46,6 +46,8 @@ ph_stats_t *ph_stats_new(void); void ph_stats_free(ph_stats_t *ps); +#endif /* __UI_PROTO_HIER_STATS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -58,5 +60,3 @@ void ph_stats_free(ph_stats_t *ps); * vi: set shiftwidth=8 tabstop=8 noexpandtab: * :indentSize=8:tabSize=8:noTabs=false: */ - -#endif /* __UI_PROTO_HIER_STATS_H__ */ diff --git a/ui/rtp_analysis.h b/ui/rtp_analysis.h index 59186bce3a..a10d628c95 100644 --- a/ui/rtp_analysis.h +++ b/ui/rtp_analysis.h @@ -127,6 +127,8 @@ extern int rtp_packet_analyse(tap_rtp_stat_t *statinfo, packet_info *pinfo, const struct _rtp_info *rtpinfo); +#endif /* __RTP_ANALYSIS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -139,5 +141,3 @@ extern int rtp_packet_analyse(tap_rtp_stat_t *statinfo, * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __RTP_ANALYSIS_H__ */ diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h index 4dcbf5165e..3c002899d6 100644 --- a/ui/rtp_stream.h +++ b/ui/rtp_stream.h @@ -149,6 +149,8 @@ gboolean rtpstream_save(rtp_stream_info_t* stream, const gchar *filename); */ void rtpstream_mark(rtp_stream_info_t* stream_fwd, rtp_stream_info_t* stream_rev); +#endif /* __RTP_STREAM_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -161,5 +163,3 @@ void rtpstream_mark(rtp_stream_info_t* stream_fwd, rtp_stream_info_t* stream_rev * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __RTP_STREAM_H__ */ diff --git a/ui/tap-megaco-common.h b/ui/tap-megaco-common.h index 6619bb5956..54e4254025 100644 --- a/ui/tap-megaco-common.h +++ b/ui/tap-megaco-common.h @@ -90,6 +90,8 @@ static const value_string megaco_message_type[] = { int megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi); +#endif /*TAP_MEGACO_COMMON_H*/ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -102,5 +104,3 @@ int megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, co * vi: set shiftwidth=8 tabstop=8 noexpandtab: * :indentSize=8:tabSize=8:noTabs=false: */ - -#endif /*TAP_MEGACO_COMMON_H*/ diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h index 918a48c310..e71d93d838 100644 --- a/ui/tap-rtp-common.h +++ b/ui/tap-rtp-common.h @@ -36,6 +36,8 @@ void rtp_write_header(rtp_stream_info_t*, FILE*); void rtp_write_sample(rtp_sample_t*, FILE*); int rtpstream_packet(void*, packet_info*, epan_dissect_t *, const void *); +#endif /*TAP_RTP_COMMON_H_INCLUDED*/ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -48,5 +50,3 @@ int rtpstream_packet(void*, packet_info*, epan_dissect_t *, const void *); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /*TAP_RTP_COMMON_H_INCLUDED*/ diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h index d28b28799a..b7fabd19db 100644 --- a/ui/tap-sctp-analysis.h +++ b/ui/tap-sctp-analysis.h @@ -350,6 +350,8 @@ const sctp_assoc_info_t* get_selected_assoc(void); } #endif /* __cplusplus */ +#endif /* __TAP_SCTP_ANALYSIS_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -362,5 +364,3 @@ const sctp_assoc_info_t* get_selected_assoc(void); * vi: set shiftwidth=8 tabstop=8 noexpandtab: * :indentSize=8:tabSize=8:noTabs=false: */ - -#endif /* __TAP_SCTP_ANALYSIS_H__ */ diff --git a/ui/time_shift.h b/ui/time_shift.h index 510280b7e3..6b64561c57 100644 --- a/ui/time_shift.h +++ b/ui/time_shift.h @@ -98,6 +98,8 @@ const gchar * time_shift_undo(capture_file *cf); } #endif /* __cplusplus */ +#endif /* __TIME_SHIFT_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -110,5 +112,3 @@ const gchar * time_shift_undo(capture_file *cf); * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __TIME_SHIFT_H__ */ diff --git a/version_info.h b/version_info.h index 198ca86663..6d01b90050 100644 --- a/version_info.h +++ b/version_info.h @@ -55,6 +55,8 @@ void get_runtime_version_info(GString *str, } #endif /* __cplusplus */ +#endif /* __VERSION_INFO_H__ */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -67,5 +69,3 @@ void get_runtime_version_info(GString *str, * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - -#endif /* __VERSION_INFO_H__ */ diff --git a/ws_symbol_export.h b/ws_symbol_export.h index 342992b012..45082d3256 100644 --- a/ws_symbol_export.h +++ b/ws_symbol_export.h @@ -180,6 +180,8 @@ */ #define WS_DLL_PUBLIC WS_DLL_PUBLIC_DEF extern +#endif /* SYMBOL_EXPORT_H */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -189,8 +191,6 @@ * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=2 tabstop=8 expandtab: + * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - -#endif /* SYMBOL_EXPORT_H */ |