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, 32 insertions, 32 deletions

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