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>

14 files changed, 30 insertions, 34 deletions

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 */