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/4688
Reviewed-by: Bill Meier <wmeier@newsguy.com>

diff --git a/capture_info.h b/capture_info.h
index cbd13336c02e1cf539e292822541cb209373b1e9..46bd72aade12c8785c9aa27e6e484008ceb96227 100644 (file)
--- a/capture_info.h
+++ b/capture_info.h
@@ -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);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 bccd8f764e8083c06fd79d7ebfdd61f051af6b55..cfbe53360ea24e91999f130c7513e1f9db44939c 100644 (file)
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -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);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */

-
-#endif /* capture_opts.h */

diff --git a/cfile.h b/cfile.h
index e45190a7cc075449959c97e8eb34d350fa1d92d8..130fafae6ceeb9c925a0f1d0a36b43468fd3de57 100644 (file)
--- a/cfile.h
+++ b/cfile.h
@@ -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)
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* cfile.h */

diff --git a/color.h b/color.h
index 4d17d6ae582e533271b9ad097bf0440844d2ead0..47f13ac14f240b0037a2d427c98eb16629c2f6e7 100644 (file)
--- a/color.h
+++ b/color.h
@@ -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
  * vi: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
  * 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 262c478476822b5f19fb6dad393308e275a44738..4ff261331386c27195aafce7a572453b3b1fa1e3 100644 (file)
--- a/conditions.h
+++ b/conditions.h
@@ -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 *);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 7761ddf0ba23d67f2ef1884a62c98814bcfde829..32e7ceebe038cc980eca9a1b52668a74058c8a7e 100644 (file)
--- 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);
 
 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
  *
 /*
  * 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:
  */
  * 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 9924e7d5a1a42979bd1ae5f7b5cb4134b45c5bc1..8c43e4af2221fbfa29aa4fd069616f6e3264079d 100644 (file)
--- 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:
  */
  * 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 47240fa83dda90b33b93e816093d059d271d597a..058cde0c13ff6e0cccf8f938636391685024e09a 100644 (file)
--- 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
 
 
 #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 ,...);
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :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 a746ae56ceca361d36f9326e178f7560426cfecf..c8e5110150daaf945a6946fb852ee12ac95e860c 100644 (file)
--- 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);
 
 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
  *
 /*
  * 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:
  */
  * 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 78597d5be50053eabedc9217fef77cb8e507e465..c3bd021d1edd9b1df1c73667fdfb1b2f642e9233 100644 (file)
--- 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[];
 
 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
  *
 /*
  * 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:
  *
  * 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:
  */
  * :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 0bd5ede862f0937eb7e387a04880785d412ec127..237145b8e04b380edcd91b37ef295dcb002263d3 100644 (file)
--- 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;
 
   struct _sctp_frag_msg* next;
 } 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 {
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif

diff --git a/epan/dissectors/packet-ses.h b/epan/dissectors/packet-ses.h
index 4d1dc29a644171fc7a70cab33ab3740198099097..225635273c72ddfa7f40f0df0fb0c9dfddd7114e 100644 (file)
--- 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;
 
 
 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;
  * vi: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
  * 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 48991f97657706d56b2e4179ec75e9d44a2cd099..ba37a8fe6dca19efabe1044c24c300ef4d7adbc3 100644 (file)
--- 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[];
 
 
 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[];
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 18838057e324c526444cd06624f73aa1d0291eed..0ee3c283c02d0f73d35e01606916cbd77a64d6f8 100644 (file)
--- 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
 
 #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
  *
 /*
  * 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:
  */
  * 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 61457b87c99b546f1d0effe09ef11acb048be980..98183928061635fc8d414df914ba170cf967d358 100644 (file)
--- 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);
 
 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
  *
 /*
  * 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:
  */
  * 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 691882f1546ca5d2002549b564bc971b423235b9..35bf77a806084afe8ec81d5709000d55e71d1e98 100644 (file)
--- 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[];
 
 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
  *
 /*
  * 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:
  */
  * 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 80ac7a74d544e265f71a008e523f9693787384ca..eb145c3ead95024cc14533990ec5ed2fc5797f13 100644 (file)
--- 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);
 
 /* 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
  *
 /*
  * 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:
  */
  * 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 75eed76b55e5aaf5e4cdd29ebccf2e847a287ef1..10603e06d7f9b31754be86176b7ca72041572e5c 100644 (file)
--- 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)
 
 /* Should this be "(freq < 4920)", or something else? */
 #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);
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=4:tabSize=8:noTabs=true:
  */

-
-#endif /* __FREQUENCY_UTILS_H__ */
-

diff --git a/epan/stats_tree.h b/epan/stats_tree.h
index 0e06cccc508e26b47707e89484eed77b09878106..15a150e6d30178a93a3d1e40190eb2e3778ce274 100644 (file)
--- 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))
 
 #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
  *
 /*
  * 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:
  */
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */

-
-#endif /* __STATS_TREE_H */

diff --git a/file.h b/file.h
index 296c0087ac4350ecc6eee0a82e4c06d2653dfcab..79c76d29f34f3b01d5d378f8d63959148aec187b 100644 (file)
--- a/file.h
+++ b/file.h
@@ -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 *);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */

-
-#endif /* file.h */

diff --git a/fileset.h b/fileset.h
index 02b4bd1ee78156653593b45de55b2b0116f667f9..1cf88adc547b644650b19ff91c954ff7721aeeb5 100644 (file)
--- a/fileset.h
+++ b/fileset.h
@@ -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);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 47b4641b50308734c1229afab6fa8a94d2fab37f..3f906e9b412ceb51996867a941d24dc9518ca65f 100644 (file)
--- 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 /* __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);
  * vi: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
  * vi: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */

-
-#endif /* __FRAME_TVBUFF_H__ */

diff --git a/globals.h b/globals.h
index f246b072f6c003332f4edbf5b69902d852e8da8b..032c5028233fb43bb71da40b581f8dffea0034db 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -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;
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */

-
-#endif /* __GLOBALS_H__ */

diff --git a/log.h b/log.h
index ed6f72499f990114ef4f38d99b47b929c4e3b30d..d79239cd401fee010cc803ef8f5908fcc7bbdd90 100644 (file)
--- a/log.h
+++ b/log.h
@@ -36,6 +36,8 @@
 /* (might slightly degrade performance) */
 /*#define LOG_CAPTURE_VERBOSE*/
 
 /* (might slightly degrade performance) */
 /*#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 @@
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 5bc07d78d21e95c75ccf2fc1d5362fa52fec6f74..234a15cdab22908f1bb7b50eb35b02ff9468e653 100644 (file)
--- 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);
 
 
    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)
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=3:tabSize=8:noTabs=true:
  */

-   dissector_add_uint("ecatf.type", 3, ioraw_handle);
-}

diff --git a/register.h b/register.h
index 1bc023de5da795ed1afbf316b0aec700eb2d4b26..b70c41d8f1d9222b6b375e2c56049a67e81da613 100644 (file)
--- a/register.h
+++ b/register.h
@@ -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);
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* __REGISTER_H__ */

diff --git a/ringbuffer.h b/ringbuffer.h
index d506ed3277f3b3b28142b820232390d02fadcbff..ca322ae8a1882672ada12202aa93ab4bee50083a 100644 (file)
--- 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);
 
 void ringbuf_free(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);
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* ringbuffer.h */

diff --git a/summary.h b/summary.h
index 6db17a1570b0e3cf82a2fb05e0674de492843c8f..699ebf404916bff474b25a6d5677d0cc620cd95b 100644 (file)
--- a/summary.h
+++ b/summary.h
@@ -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
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* summary.h */

diff --git a/sync_pipe.h b/sync_pipe.h
index 2a846a1c2cc6de79e70111e143b291771b883074..2cef98ec8cab347b2bf790a1c9415135077e7978 100644 (file)
--- 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
 
 #define SIGNAL_PIPE_FORMAT "\\\\.\\pipe\\wireshark.%s.signal"
 #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,
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 60d953f6d4d557e1fa813a243503e4135fb2c416..964d5d22d40781708ea91a72a9f162bbb1d9543e 100644 (file)
--- a/text2pcap.h
+++ b/text2pcap.h
@@ -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);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
  * 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 f29d99f64b3de9cc7f79c1d09b56e7910a925fbf..6407e4b2d83804fc213e05689152bc493fd3a627 100644 (file)
--- a/ui/capture.h
+++ b/ui/capture.h
@@ -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);
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* capture.h */

diff --git a/ui/capture_ui_utils.h b/ui/capture_ui_utils.h
index 211f805b035b574077fcf9b09b791831a2c7fa1f..5931086bba412e8590c3510ea5e50dce6be6ddd0 100644 (file)
--- 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 /* __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
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :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 f6b86b4022f3dbc63fe3faf1b2f4c6a853622605..bc00881644402a82d2e0591e259fe2e1d9fffe01 100644 (file)
--- a/ui/decode_as_utils.h
+++ b/ui/decode_as_utils.h
@@ -77,6 +77,8 @@ void decode_clear_all(void);
 }
 #endif /* __cplusplus */
 
 }
 #endif /* __cplusplus */
 

+#endif /* __DECODE_AS_UTILS_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 38e361867f9d8f32138b4a10a79fa1955ead9f3d..330150f51549dbe69390b0afe070960448d847ba 100644 (file)
--- 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 /* __cplusplus */
 

+#endif /* __UI_FILTERS_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* __UI_FILTERS_H__ */

diff --git a/ui/persfilepath_opt.h b/ui/persfilepath_opt.h
index 03555800a4c07575319e102bb0c9c2b4a379699a..0edd5e57a026a6ecfef9a388d2f0e40f0ab2c10b 100644 (file)
--- 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 /* __cplusplus */
 

+#endif /* PERSFILEPATH_OPT_H */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 098bcbc600c592d3509e3a6b9b81d3066dd044c4..c60b32c13a8b6510cb946723b15781b3725eb6e0 100644 (file)
--- a/ui/preference_utils.h
+++ b/ui/preference_utils.h
@@ -108,6 +108,8 @@ void column_prefs_remove_nth(gint col);
 }
 #endif /* __cplusplus */
 
 }
 #endif /* __cplusplus */
 

+#endif /* __PREFRENCE_UTILS_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* __PREFRENCE_UTILS_H__ */

diff --git a/ui/profile.h b/ui/profile.h
index f3295306dd3a1d93c33c4f7a87933b74e033f28e..6d4d26a887da9810b886f3e312d6be0947ba6cec 100644 (file)
--- a/ui/profile.h
+++ b/ui/profile.h
@@ -128,6 +128,8 @@ gboolean delete_current_profile(void);
 }
 #endif /* __cplusplus */
 
 }
 #endif /* __cplusplus */
 

+#endif /* __PROFILE_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 dd1090397155072b4bdc773179ba751b351bc89e..c3ba23b8a0d0b3437ab2df0d05c08c2861e76dd3 100644 (file)
--- 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);
 
 
 void ph_stats_free(ph_stats_t *ps);
 

+#endif /* __UI_PROTO_HIER_STATS_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 59186bce3ac6aa8f1f6219fefa01164a0a5b5d7f..a10d628c952086a256db327ef3c7bd1e9f10b934 100644 (file)
--- 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);
 
                               packet_info *pinfo,
                               const struct _rtp_info *rtpinfo);
 

+#endif /* __RTP_ANALYSIS_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 4dcbf5165e2d8025e09c23d17453f53642642c4d..3c002899d60674f4c770d1d1a89380ea06dad6c8 100644 (file)
--- 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);
 
 */
 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
  *
 /*
  * 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:
  */
  * 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 6619bb5956076034d5d4f8f3775763082ddb0c1e..54e4254025302332cafbd8f2c9bb890df78cfb99 100644 (file)
--- 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);
 
 
 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
  *
 /*
  * 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:
  */
  * 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 918a48c31064ef9b61323bfd50ac9b80f7bfc980..e71d93d8381a2d93c786f5bac0dbcc9165d706e4 100644 (file)
--- 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 *);
 
 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
  *
 /*
  * 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:
  */
  * 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 d28b28799abc58f70ac484e79ab1cd8ed7d3740c..b7fabd19db0f69c2663e680a34e2e6db0ed31edd 100644 (file)
--- 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 /* __cplusplus */
 

+#endif /* __TAP_SCTP_ANALYSIS_H__ */
+

 /*
  * Editor modelines  - http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 510280b7e37214a884cf731fd6970ff54fd333c1..6b64561c57c65a42e4cb815d12bd6c31019bf518 100644 (file)
--- 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 /* __cplusplus */
 

+#endif /* __TIME_SHIFT_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 198ca866639cd88d9fff943b6e0be6d921cbe70e..6d01b90050bcaa44dec0bcc315fb4ee1ce868d6b 100644 (file)
--- a/version_info.h
+++ b/version_info.h
@@ -55,6 +55,8 @@ void get_runtime_version_info(GString *str,
 }
 #endif /* __cplusplus */
 
 }
 #endif /* __cplusplus */
 

+#endif /* __VERSION_INFO_H__ */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * 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:
  */
  * 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 342992b01294bb513f5cb09392d3333f98307f2e..45082d3256b3a1cf10c47afdbe62f4b4e3db1252 100644 (file)
--- a/ws_symbol_export.h
+++ b/ws_symbol_export.h
@@ -180,6 +180,8 @@
  */
 #define WS_DLL_PUBLIC  WS_DLL_PUBLIC_DEF extern
 
  */
 #define WS_DLL_PUBLIC  WS_DLL_PUBLIC_DEF extern
 

+#endif /* SYMBOL_EXPORT_H */
+

 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *


@@ -189,8 +191,6 @@
  * indent-tabs-mode: nil
  * End:
  *
  * 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:
  */
  * :indentSize=2:tabSize=8:noTabs=true:
  */

-
-#endif /* SYMBOL_EXPORT_H */