Commit bfe37060 authored by Bill Meier's avatar Bill Meier

Always put editor-modelines at the end of the file ...

... to ensure that there are no potential issues with respect to
editors limiting the number of lines scanned at the end of the file
when checking for editor modelines.

Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4
Reviewed-on: https://code.wireshark.org/review/4688Reviewed-by: default avatarBill Meier <wmeier@newsguy.com>
parent 71c5ac03
...@@ -79,6 +79,8 @@ capture_info *cinfo); ...@@ -79,6 +79,8 @@ capture_info *cinfo);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* capture_info.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -91,5 +93,3 @@ capture_info *cinfo); ...@@ -91,5 +93,3 @@ capture_info *cinfo);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* capture_info.h */
...@@ -372,6 +372,8 @@ collect_ifaces(capture_options *capture_opts); ...@@ -372,6 +372,8 @@ collect_ifaces(capture_options *capture_opts);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* capture_opts.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -384,5 +386,3 @@ collect_ifaces(capture_options *capture_opts); ...@@ -384,5 +386,3 @@ collect_ifaces(capture_options *capture_opts);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :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) ...@@ -138,6 +138,8 @@ extern const char *cap_file_get_interface_name(void *data, guint32 interface_id)
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* cfile.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * 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) ...@@ -147,8 +149,6 @@ extern const char *cap_file_get_interface_name(void *data, guint32 interface_id)
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :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 ...@@ -58,6 +58,8 @@ gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 bl
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __COLOR_H__ */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * 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 ...@@ -70,5 +72,3 @@ gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 bl
* vi: set shiftwidth=8 tabstop=8 noexpandtab: * vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false: * :indentSize=8:tabSize=8:noTabs=false:
*/ */
#endif /* __COLOR_H__ */
...@@ -129,6 +129,8 @@ void* cnd_get_user_data(condition*); ...@@ -129,6 +129,8 @@ void* cnd_get_user_data(condition*);
*/ */
void cnd_set_user_data(condition *, void *); void cnd_set_user_data(condition *, void *);
#endif /* CONDITIONS_H */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -141,5 +143,3 @@ void cnd_set_user_data(condition *, void *); ...@@ -141,5 +143,3 @@ void cnd_set_user_data(condition *, void *);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* CONDITIONS_H */
...@@ -34,6 +34,8 @@ guint16 de_bssgp_cell_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gu ...@@ -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_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); 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 * 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 ...@@ -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: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* __PACKET_BSSGP_H__ */
...@@ -514,5 +514,3 @@ proto_reg_handoff_corosync_totemnet(void) ...@@ -514,5 +514,3 @@ proto_reg_handoff_corosync_totemnet(void)
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
/* packet-corosync-totemnet.c ends here */
...@@ -645,6 +645,8 @@ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); ...@@ -645,6 +645,8 @@ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...);
#define CSNDESCR(_FuncType) CSNDESCR_##_FuncType #define CSNDESCR(_FuncType) CSNDESCR_##_FuncType
#endif /*_PACKET_CSN1_H_*/
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -654,8 +656,6 @@ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); ...@@ -654,8 +656,6 @@ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...);
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif /*_PACKET_CSN1_H_*/
...@@ -63,6 +63,8 @@ const gchar * dissect_e212_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t ...@@ -63,6 +63,8 @@ const gchar * dissect_e212_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
WS_DLL_PUBLIC WS_DLL_PUBLIC
const gchar * dissect_e212_utf8_imsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int length); 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 * 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 ...@@ -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: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* __PACKET_E212_H__ */
...@@ -5244,6 +5244,8 @@ extern const guint8 gsm_rlcmac_egprs_header_type_to_dl_header_block_length[]; ...@@ -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_header_type_to_ul_header_block_length[];
extern const guint8 gsm_rlcmac_egprs_mcs_to_data_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 * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -5253,8 +5255,6 @@ extern const guint8 gsm_rlcmac_egprs_mcs_to_data_block_length[]; ...@@ -5253,8 +5255,6 @@ extern const guint8 gsm_rlcmac_egprs_mcs_to_data_block_length[];
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif /* __PACKET_GSM_RLCMAC_H__ */
...@@ -77,6 +77,8 @@ typedef struct _sctp_frag_msg { ...@@ -77,6 +77,8 @@ typedef struct _sctp_frag_msg {
struct _sctp_frag_msg* next; struct _sctp_frag_msg* next;
} sctp_frag_msg; } sctp_frag_msg;
#endif
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -86,8 +88,6 @@ typedef struct _sctp_frag_msg { ...@@ -86,8 +88,6 @@ typedef struct _sctp_frag_msg {
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif
...@@ -207,6 +207,8 @@ struct SESSION_DATA_STRUCTURE ...@@ -207,6 +207,8 @@ struct SESSION_DATA_STRUCTURE
extern value_string_ext ses_vals_ext; extern value_string_ext ses_vals_ext;
#endif
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -219,5 +221,3 @@ extern value_string_ext ses_vals_ext; ...@@ -219,5 +221,3 @@ extern value_string_ext ses_vals_ext;
* vi: set shiftwidth=8 tabstop=8 noexpandtab: * vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false: * :indentSize=8:tabSize=8:noTabs=false:
*/ */
#endif
...@@ -272,6 +272,8 @@ typedef struct{ ...@@ -272,6 +272,8 @@ typedef struct{
extern const value_string zbee_aps_cid_names[]; extern const value_string zbee_aps_cid_names[];
#endif /* PACKET_ZBEE_APS_H*/
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -284,5 +286,3 @@ extern const value_string zbee_aps_cid_names[]; ...@@ -284,5 +286,3 @@ extern const value_string zbee_aps_cid_names[];
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* PACKET_ZBEE_APS_H*/
...@@ -203,6 +203,8 @@ extern GHashTable *zbee_table_link_keyring; ...@@ -203,6 +203,8 @@ extern GHashTable *zbee_table_link_keyring;
#define ZBEE_IP_BEACON_TLV_TYPE_MASK 0xf0 #define ZBEE_IP_BEACON_TLV_TYPE_MASK 0xf0
#define ZBEE_IP_BEACON_TLV_TYPE_LFDI 0x0 #define ZBEE_IP_BEACON_TLV_TYPE_LFDI 0x0
#endif /* PACKET_ZBEE_NWK_H */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -215,6 +217,3 @@ extern GHashTable *zbee_table_link_keyring; ...@@ -215,6 +217,3 @@ extern GHashTable *zbee_table_link_keyring;
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* PACKET_ZBEE_NWK_H */
...@@ -80,6 +80,8 @@ extern void zbee_security_handoff (void); ...@@ -80,6 +80,8 @@ extern void zbee_security_handoff (void);
extern tvbuff_t *dissect_zbee_secure(tvbuff_t *, packet_info *, proto_tree *, guint); 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); 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 * 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 * ...@@ -92,5 +94,3 @@ extern gboolean zbee_sec_ccm_decrypt(const gchar *, const gchar *, const gchar *
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* PACKET_ZBEE_SECURITY_H */
...@@ -388,6 +388,8 @@ extern void zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *o ...@@ -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_cluster_names[];
extern const value_string zbee_zdp_rtg_status_vals[]; extern const value_string zbee_zdp_rtg_status_vals[];
#endif /* PACKET_ZBEE_ZDP_H */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -400,5 +402,3 @@ extern const value_string zbee_zdp_rtg_status_vals[]; ...@@ -400,5 +402,3 @@ extern const value_string zbee_zdp_rtg_status_vals[];
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* PACKET_ZBEE_ZDP_H */
...@@ -806,6 +806,8 @@ ...@@ -806,6 +806,8 @@
/* Helper Functions */ /* Helper Functions */
extern guint zbee_get_bit_field(guint input, guint mask); extern guint zbee_get_bit_field(guint input, guint mask);
#endif /* PACKET_ZBEE_H */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -818,5 +820,3 @@ extern guint zbee_get_bit_field(guint input, guint mask); ...@@ -818,5 +820,3 @@ extern guint zbee_get_bit_field(guint input, guint mask);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* PACKET_ZBEE_H */
...@@ -60,6 +60,8 @@ ieee80211_mhz_to_str(guint freq); ...@@ -60,6 +60,8 @@ ieee80211_mhz_to_str(guint freq);
/* Should this be "(freq < 4920)", or something else? */ /* Should this be "(freq < 4920)", or something else? */
#define FREQ_IS_BG(freq) (freq <= 2484) #define FREQ_IS_BG(freq) (freq <= 2484)
#endif /* __FREQUENCY_UTILS_H__ */
/* /*
* Editor modelines * Editor modelines
* *
...@@ -69,9 +71,6 @@ ieee80211_mhz_to_str(guint freq); ...@@ -69,9 +71,6 @@ ieee80211_mhz_to_str(guint freq);
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* __FREQUENCY_UTILS_H__ */
...@@ -233,6 +233,8 @@ WS_DLL_PUBLIC int stats_tree_manip_node(manip_node_mode mode, ...@@ -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) \ #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)) (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 * 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, ...@@ -245,5 +247,3 @@ WS_DLL_PUBLIC int stats_tree_manip_node(manip_node_mode mode,
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* __STATS_TREE_H */
...@@ -682,6 +682,8 @@ void read_keytab_file(const char *); ...@@ -682,6 +682,8 @@ void read_keytab_file(const char *);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* file.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -694,5 +696,3 @@ void read_keytab_file(const char *); ...@@ -694,5 +696,3 @@ void read_keytab_file(const char *);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* file.h */
...@@ -63,6 +63,8 @@ extern void fileset_update_file(const char *path); ...@@ -63,6 +63,8 @@ extern void fileset_update_file(const char *path);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __FILESET_H__ */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -75,5 +77,3 @@ extern void fileset_update_file(const char *path); ...@@ -75,5 +77,3 @@ extern void fileset_update_file(const char *path);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* __FILESET_H__ */
...@@ -41,6 +41,8 @@ extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf); ...@@ -41,6 +41,8 @@ extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __FRAME_TVBUFF_H__ */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * 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); ...@@ -53,5 +55,3 @@ extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf);
* vi: set shiftwidth=8 tabstop=8 noexpandtab: * vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false: * :indentSize=8:tabSize=8:noTabs=false:
*/ */
#endif /* __FRAME_TVBUFF_H__ */
...@@ -36,6 +36,8 @@ extern capture_file cfile; ...@@ -36,6 +36,8 @@ extern capture_file cfile;
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GLOBALS_H__ */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -48,5 +50,3 @@ extern capture_file cfile; ...@@ -48,5 +50,3 @@ extern capture_file cfile;
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* __GLOBALS_H__ */
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
/* (might slightly degrade performance) */ /* (might slightly degrade performance) */
/*#define LOG_CAPTURE_VERBOSE*/ /*#define LOG_CAPTURE_VERBOSE*/
#endif
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -48,5 +50,3 @@ ...@@ -48,5 +50,3 @@
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif
...@@ -116,6 +116,9 @@ void proto_reg_handoff_ioraw(void) ...@@ -116,6 +116,9 @@ void proto_reg_handoff_ioraw(void)
ioraw_handle = create_dissector_handle(dissect_ioraw, proto_ioraw); 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 * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -125,8 +128,6 @@ void proto_reg_handoff_ioraw(void) ...@@ -125,8 +128,6 @@ void proto_reg_handoff_ioraw(void)
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=3 tabstop=8 expandtab: * vi: set shiftwidth=3 tabstop=8 expandtab:
* :indentSize=3:tabSize=8:noTabs=true: * :indentSize=3:tabSize=8:noTabs=true:
*/ */
dissector_add_uint("ecatf.type", 3, ioraw_handle);
}
...@@ -57,6 +57,8 @@ WS_DLL_PUBLIC gulong register_count(void); ...@@ -57,6 +57,8 @@ WS_DLL_PUBLIC gulong register_count(void);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __REGISTER_H__ */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -66,8 +68,6 @@ WS_DLL_PUBLIC gulong register_count(void); ...@@ -66,8 +68,6 @@ WS_DLL_PUBLIC gulong register_count(void);
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif /* __REGISTER_H__ */
...@@ -45,6 +45,8 @@ gboolean ringbuf_libpcap_dump_close(gchar **save_file, int *err); ...@@ -45,6 +45,8 @@ gboolean ringbuf_libpcap_dump_close(gchar **save_file, int *err);
void ringbuf_free(void); void ringbuf_free(void);
void ringbuf_error_cleanup(void); void ringbuf_error_cleanup(void);
#endif /* ringbuffer.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -54,8 +56,6 @@ void ringbuf_error_cleanup(void); ...@@ -54,8 +56,6 @@ void ringbuf_error_cleanup(void);
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :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 ...@@ -97,6 +97,8 @@ summary_fill_in_capture(capture_file *cf, capture_options *capture_opts, summary
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* summary.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * 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 ...@@ -106,8 +108,6 @@ summary_fill_in_capture(capture_file *cf, capture_options *capture_opts, summary
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif /* summary.h */
...@@ -86,6 +86,8 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg, ...@@ -86,6 +86,8 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg,
#define SIGNAL_PIPE_FORMAT "\\\\.\\pipe\\wireshark.%s.signal" #define SIGNAL_PIPE_FORMAT "\\\\.\\pipe\\wireshark.%s.signal"
#endif #endif
#endif /* sync_pipe.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * 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, ...@@ -98,5 +100,3 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg,
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif /* sync_pipe.h */
...@@ -44,6 +44,8 @@ void parse_token(token_t token, char *str); ...@@ -44,6 +44,8 @@ void parse_token(token_t token, char *str);
int yylex(void); int yylex(void);
#endif
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -56,5 +58,3 @@ int yylex(void); ...@@ -56,5 +58,3 @@ int yylex(void);
* vi: set shiftwidth=4 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */
#endif
...@@ -105,6 +105,8 @@ void capture_stat_stop(if_stat_cache_t *sc); ...@@ -105,6 +105,8 @@ void capture_stat_stop(if_stat_cache_t *sc);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* capture.h */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * Editor modelines - http://www.wireshark.org/tools/modelines.html
* *
...@@ -114,8 +116,6 @@ void capture_stat_stop(if_stat_cache_t *sc); ...@@ -114,8 +116,6 @@ void capture_stat_stop(if_stat_cache_t *sc);
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif /* capture.h */
...@@ -123,6 +123,8 @@ const char *get_iface_description_for_interface(capture_options *capture_opts, g ...@@ -123,6 +123,8 @@ const char *get_iface_description_for_interface(capture_options *capture_opts, g
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __CAPTURE_UI_UTILS_H__ */
/* /*
* Editor modelines - http://www.wireshark.org/tools/modelines.html * 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 ...@@ -132,8 +134,6 @@ const char *get_iface_description_for_interface(capture_options *capture_opts, g
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=2:tabSize=8:noTabs=true:
*/ */
#endif /* __CAPTURE_UI_UTILS_H__ */
...@@ -77,6 +77,8 @@ void decode_clear_all(void); ...@@ -77,6 +77,8 @@ void decode_clear_all(void);
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __DECODE_AS_UTILS_H__ */
/*