Cleanup header file define guards.

svn path=/trunk/; revision=33230
This commit is contained in:
Stig Bjørlykke 2010-06-15 21:18:31 +00:00
parent 6117869099
commit b940189f7a
40 changed files with 148 additions and 69 deletions

View File

@ -22,6 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __CAPTURE_IF_DETAILS_DLG_H__
#define __CAPTURE_IF_DETAILS_DLG_H__
/** @file
* Capture "Interface Details" dialog box
* @ingroup dialog_group
@ -38,3 +41,5 @@ extern void capture_if_details_open(char *iface);
* @param iface the interface name to test
*/
extern gboolean capture_if_has_details(char *iface);
#endif /* __CAPTURE_IF_DETAILS_DLG_H__ */

View File

@ -22,6 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __CFILTER_COMBO_UTILS_H__
#define __CFILTER_COMBO_UTILS_H__
/** @file
* Capture filter combo box routines
*/
@ -32,3 +35,5 @@ extern gboolean cfilter_combo_add_recent(gchar *s);
#define E_CFILTER_CM_KEY "capture_filter_combo"
#define E_CFILTER_FL_KEY "capture_filter_list"
#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
#endif /* __CFILTER_COMBO_UTILS_H__ */

View File

@ -21,6 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COLORS_H__
#define __COLORS_H__

View File

@ -22,8 +22,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __CONVERSATIONS_TABLE_H__
#define __CONVERSATIONS_TABLE_H__
#include "sat.h"
/** @file

View File

@ -22,4 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __EXPERT_COMP_DLG_H__
#define __EXPERT_COMP_DLG_H__
void expert_comp_dlg_cb(GtkWidget *w, gpointer d);
#endif /* __EXPERT_COMP_DLG_H__ */

View File

@ -25,6 +25,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __EXPERT_COMP_TABLE_H__
#define __EXPERT_COMP_TABLE_H__
#include <gtk/gtk.h>
#include <epan/expert.h>
#include <gtk/expert_dlg.h>
@ -86,3 +89,4 @@ void reset_error_table_data(error_equiv_table *err);
*/
void free_error_table_data(error_equiv_table *err);
#endif /* __EXPERT_COMP_TABLE_H__ */

View File

@ -28,6 +28,7 @@
#ifndef __EXPERT_DLG_H__
#define __EXPERT_DLG_H__
#include <gtk/gtk.h>
typedef struct expert_tapdata_s {

View File

@ -1,4 +1,4 @@
/* win32-file-dlg.h
/* win32_file_dlg.h
* Native Windows file dialog routines
*
* $Id$

View File

@ -21,6 +21,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __FILTER_UTILS_H__
#define __FILTER_UTILS_H__
#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
/* Filter actions */
@ -60,3 +63,5 @@
extern void apply_selected_filter (guint callback_action, char *filter);
#endif /* __FILTER_UTILS_H__ */

View File

@ -1,7 +1,7 @@
/* firewall_dlg.h
* Produce ACL rules for various products from a packet.
*
* $Id:$
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -22,11 +22,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef FIREWALL_DLG_H_INCLUDED
#define FIREWALL_DLG_H_INCLUDED
#ifndef __FIREWALL_DLG_H__
#define __FIREWALL_DLG_H__
/* Generate ACL / firewall rules from different fields in the
selected packet. */
void firewall_rule_cb(GtkWidget * w, gpointer data _U_);
#endif /* FIREWALL_DLG_H_INCLUDED */
#endif /* __FIREWALL_DLG_H__ */

View File

@ -1,4 +1,4 @@
/* follow_stream.c
/* follow_stream.h
* Common routines for following data streams
*
* $Id$
@ -23,6 +23,9 @@
* USA.
*/
#ifndef __FOLLOW_STREAM_H__
#define __FOLLOW_STREAM_H__
#include <gtk/gtk.h>
/* Type of follow we are doing */
@ -108,3 +111,5 @@ gboolean follow_add_to_gtk_text(char *buffer, size_t nchars, gboolean is_server,
frs_return_t follow_read_tcp_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg);
frs_return_t follow_read_udp_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg);
frs_return_t follow_read_ssl_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg);
#endif /* __FOLLOW_STREAM_H__ */

View File

@ -28,8 +28,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef GRAPH_ANALYSIS_H_INCLUDED
#define GRAPH_ANALYSIS_H_INCLUDED
#ifndef __GRAPH_ANALYSIS_H__
#define __GRAPH_ANALYSIS_H__
#include <glib.h>
#include <gtk/gtk.h>
@ -130,4 +130,4 @@ void graph_analysis_update(graph_analysis_data_t* user_data);
void graph_analysis_redraw(graph_analysis_data_t* user_data);
#endif /*GRAPH_ANALYSIS_H_INCLUDED*/
#endif /* __GRAPH_ANALYSIS_H__ */

View File

@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GSM_MAP_STAT_H__
#define __GSM_MAP_STAT_H__
/** @file
* Statistics for GSM MAP Operations.
*/
@ -39,3 +42,5 @@ typedef struct _gsm_map_stat_t {
/** Global gsm map statistic data */
extern gsm_map_stat_t gsm_map_stat;
#endif /* __GSM_MAP_STAT_H__ */

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTKGUISTATMENU_H__
#define __GTKGUISTATMENU_H__
#ifndef __GTK_STAT_MENU_H__
#define __GTK_STAT_MENU_H__
#ifdef __cplusplus
extern "C" {
@ -88,4 +88,4 @@ extern void register_stat_menu_item_stock(
}
#endif /* __cplusplus */
#endif /* __GTKGUISTATMENU_H__ */
#endif /* __GTK_STAT_MENU_H__ */

View File

@ -23,9 +23,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __gtk_stat_util__
#define __gtk_stat_util__
#ifndef __GTK_STAT_UTIL_H__
#define __GTK_STAT_UTIL_H__
#include <gtk/gtk.h>
@ -63,4 +62,4 @@ extern void init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, const c
*/
extern GtkTreeView *create_stat_table(GtkWidget *scrolled_window, GtkWidget *vbox, int columns, const stat_column *headers);
#endif
#endif /* __GUI_STAT_UTIL_H__ */

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTKGUIUI_UTIL_H__
#define __GTKGUIUI_UTIL_H__
#ifndef __GUI_UTILS_H__
#define __GUI_UTILS_H__
/** @defgroup windows_group Windows
*
@ -461,4 +461,4 @@ gint ws_combo_box_get_active(GtkComboBox *combo_box);
void ws_combo_box_set_active(GtkComboBox *combo_box, gint idx);
#endif /* __GTKGUIUI_UTIL_H__ */
#endif /* __GUI_UTIL__H__ */

View File

@ -23,6 +23,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __HOSTLIST_TABLE_H__
#define __HOSTLIST_TABLE_H__
#include "sat.h"
/** @file
@ -116,3 +119,5 @@ extern void init_hostlist_notebook_cb(GtkWidget *w, gpointer d);
*/
void add_hostlist_table_data(hostlist_table *hl, const address *addr,
guint32 port, gboolean sender, int num_frames, int num_bytes, SAT_E sat, int port_type);
#endif /* __HOSTLIST_TABLE_H__ */

View File

@ -30,8 +30,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef IAX2_ANALYSIS_H_INCLUDED
#define IAX2_ANALYSIS_H_INCLUDED
#ifndef __IAX2_ANALYSIS_H__
#define __IAX2_ANALYSIS_H__
#include <glib.h>
#include <epan/address.h>
@ -116,4 +116,4 @@ extern int iax2_packet_analyse(tap_iax2_stat_t *statinfo,
const struct _iax2_info_t *iax2info);
#endif /*IAX2_ANALYSIS_H_INCLUDED*/
#endif /* __IAX2_ANALYSIS_H__ */

View File

@ -20,7 +20,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MACROS_DLG_H_
#define __MACROS_DLG_H_
void macros_dialog_cb(GtkWidget*, gpointer);
#endif
#ifndef __MACROS_DLG_H__
#define __MACROS_DLG_H__
void macros_dialog_cb(GtkWidget*, gpointer);
#endif /* __MACROS_DLG_H__ */

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __PACKET_LIST_H__
#define __PACKET_LIST_H__
#ifndef __MAIN_PACKET_LIST_H__
#define __MAIN_PACKET_LIST_H__
#ifndef NEW_PACKET_LIST
@ -177,4 +177,4 @@ extern void packet_list_recent_write_all(FILE *rf);
#endif /* NEW_PACKET_LIST */
#endif /* __PACKET_LIST_H__ */
#endif /* __MAIN_PACKET_LIST_H__ */

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTKPACKET_H__
#define __GTKPACKET_H__
#ifndef __MAIN_PROTO_DRAW_H__
#define __MAIN_PROTO_DRAW_H__
/** @file
* Packet tree and details panes.
@ -244,4 +244,4 @@ extern gchar *expert_color_warn_str;
extern gchar *expert_color_error_str;
extern gchar *expert_color_foreground_str;
#endif
#endif /* __MAIN_PROTO_DRAW_H__ */

View File

@ -23,4 +23,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MANUAL_ADDR_RESOLV_H__
#define __MANUAL_ADDR_RESOLV_H__
void manual_addr_resolv_dlg (GtkWidget *w _U_, gpointer data);
#endif /* __MANUAL_ADDR_RESOLV_H__ */

View File

@ -29,8 +29,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef Mcast_STREAM_H_INCLUDED
#define Mcast_STREAM_H_INCLUDED
#ifndef __MCAST_STREAM_H__
#define __MCAST_STREAM_H__
#include <glib.h>
#include <stdio.h>
@ -146,4 +146,4 @@ void mcaststream_reset(mcaststream_tapinfo_t *tapinfo);
*/
void mcaststream_scan(void);
#endif /*Mcast_STREAM_H_INCLUDED*/
#endif /* __MCAST_STREAM_H__ */

View File

@ -29,8 +29,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef Mcast_STREAM_DLG_H_INCLUDED
#define Mcast_STREAM_DLG_H_INCLUDED
#ifndef __MCAST_STREAM_DLG_H__
#define __MCAST_STREAM_DLG_H__
#include <gtk/gtk.h>
@ -52,4 +52,4 @@ void mcaststream_dlg_show(GList *list);
*/
void mcaststream_dlg_update(GList *list);
#endif /*Mcast_STREAM_DLG_H_INCLUDED*/
#endif /* __MCAST_STREAM_DLG_H__ */

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MAIN_MENU_H__
#define __MAIN_MENU_H__
#ifndef __MENUS_H__
#define __MENUS_H__
#ifdef __cplusplus
extern "C" {
@ -142,4 +142,4 @@ void set_menus_for_selected_packet(capture_file *cf);
}
#endif /* __cplusplus */
#endif /* __MAIN_MENU_H__ */
#endif /* __MENUS_H__ */

View File

@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MTP3_STAT_H__
#define __MTP3_STAT_H__
/** @file
* Statistics for MTP3.
* @todo Could someone with more knowledge of this comment it for doxygen?
@ -48,3 +51,5 @@ typedef struct _mtp3_stat_t {
extern mtp3_stat_t mtp3_stat[];
extern guint8 mtp3_num_used;
#endif /* __MTP3_STAT_H__ */

View File

@ -22,7 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __PACKET_HISTORY_H__
#define __PACKET_HISTORY_H__
extern void packet_history_add(gint row);
@ -32,4 +33,4 @@ extern void history_forward_cb(GtkWidget *widget, gpointer data);
extern void history_back_cb(GtkWidget *widget, gpointer data);
#endif /* __PACKET_HISTORY_H__ */

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTKGUIPLUGINS_H__
#define __GTKGUIPLUGINS_H__
#ifndef __PLUGINS_DLG_H__
#define __PLUGINS_DLG_H__
#ifdef __cplusplus
extern "C" {
@ -35,4 +35,4 @@ GtkWidget * about_plugins_page_new(void);
}
#endif /* __cplusplus */
#endif /* __GTKGUIPLUGINS_H__ */
#endif /* __PLUGINS_DLG_H__ */

View File

@ -29,8 +29,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef RTP_ANALYSIS_H_INCLUDED
#define RTP_ANALYSIS_H_INCLUDED
#ifndef __RTP_ANALYSIS_H__
#define __RTP_ANALYSIS_H__
#include <glib.h>
#include <epan/address.h>
@ -128,4 +128,4 @@ extern int rtp_packet_analyse(tap_rtp_stat_t *statinfo,
const struct _rtp_info *rtpinfo);
#endif /*RTP_ANALYSIS_H_INCLUDED*/
#endif /* __RTP_ANALYSIS_H__ */

View File

@ -33,6 +33,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __RTP_PLAYER_H__
#define __RTP_PLAYER_H__
#ifdef HAVE_LIBPORTAUDIO
void rtp_player_init(voip_calls_tapinfo_t *voip_calls_tap);
@ -40,3 +43,5 @@ void add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo);
void reset_rtp_player(void);
#endif /* HAVE_LIBPORTAUDIO */
#endif /* __RTP_PLAYER_H__ */

View File

@ -25,8 +25,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef RTP_STREAM_H_INCLUDED
#define RTP_STREAM_H_INCLUDED
#ifndef __RTP_STREAM_H__
#define __RTP_STREAM_H__
#include "rtp_analysis.h"
#include <glib.h>
@ -157,4 +157,4 @@ 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_INCLUDED*/
#endif /* __RTP_STREAM_H__ */

View File

@ -25,8 +25,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef RTP_STREAM_DLG_H_INCLUDED
#define RTP_STREAM_DLG_H_INCLUDED
#ifndef __RTP_STREAM_DLG_H__
#define __RTP_STREAM_DLG_H__
#include <gtk/gtk.h>
@ -48,4 +48,4 @@ void rtpstream_dlg_show(GList *list);
*/
void rtpstream_dlg_update(GList *list);
#endif /*RTP_STREAM_DLG_H_INCLUDED*/
#endif /* __RTP_STREAM_DLG_H__ */

View File

@ -21,7 +21,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __SCTP_STAT_H__
#define __SCTP_STAT_H__
#include <epan/dissectors/packet-sctp.h>
#include <epan/address.h>
#ifndef _WIN32
@ -405,4 +408,5 @@ void set_analyse_child(struct sctp_analyse *child);
void remove_analyse_child(struct sctp_analyse *child);
void sctp_set_assoc_filter(void);
#endif /* __SCTP_STAT_H__ */

View File

@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __SERVICE_RESPONSE_TIME_TABLE_H__
#define __SERVICE_RESPONSE_TIME_TABLE_H__
#include <gtk/gtk.h>
#include "epan/nstime.h"
#include "../timestats.h"
@ -96,3 +99,4 @@ void reset_srt_table_data(srt_stat_table *rst);
*/
void free_srt_table_data(srt_stat_table *rst);
#endif /* __SERVICE_RESPONSE_TIME_TABLE_H__ */

View File

@ -24,8 +24,8 @@
*
*/
#ifndef __SUPPORTED_DLG_H__
#define __SUPPORTED_DLG_H__
#ifndef __SUPPORTED_PROTOS_DLG_H__
#define __SUPPORTED_PROTOS_DLG_H__
/** @file
* "Supported Protocols" dialog box.
@ -42,4 +42,4 @@ void supported_cb(GtkWidget *widget, gpointer data);
/** Redraw all the supported protos text widgets, to use a new font. */
void supported_redraw(void);
#endif
#endif /* __SUPPORTED_PROTOS_DLG_H__ */

View File

@ -23,6 +23,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __TAP_DFILTER_DLG_H__
#define __TAP_DFILTER_DLG_H__
/*
* You can easily add a display filter dialog for your gui tap by using
* the following infrastructure:
@ -71,3 +74,5 @@ void register_dfilter_stat(tap_dfilter_dlg *info, const char *name,
/* This will update the titles of the dialog windows when we load a new capture file. */
void tap_dfilter_dlg_update (void);
#endif /* __TAP_DFILTER_DLG_H__ */

View File

@ -22,6 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTK_U3_H__
#define __GTK_U3_H__
gboolean u3_active(void);
void u3_runtime_info(GString *str);
@ -31,3 +34,5 @@ void u3_deregister_pid(void);
char * u3_expand_device_path(char *path);
char * u3_contract_device_path(char *path);
#endif /* __GTK_U3_H__ */

View File

@ -27,9 +27,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _UAT_GUI_H_
#define _UAT_GUI_H_
#ifndef __UAT_GUI_H__
#define __UAT_GUI_H__
void uat_window_cb(GtkWidget* unused, void* uat);
#endif
#endif /* __UAT_GUI_H__ */

View File

@ -33,8 +33,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef VOIP_CALLS_H_INCLUDED
#define VOIP_CALLS_H_INCLUDED
#ifndef __VOIP_CALLS_H__
#define __VOIP_CALLS_H__
#include <glib.h>
#include <stdio.h>
@ -294,4 +294,4 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo);
void graph_analysis_data_init(void);
#endif /*VOIP_CALLS_H_INCLUDED*/
#endif /* __VOIP_CALLS_H__ */

View File

@ -33,8 +33,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef VOIP_CALLS_DLG_H_INCLUDED
#define VOIP_CALLS_DLG_H_INCLUDED
#ifndef __VOIP_CALLS_DLG_H__
#define __VOIP_CALLS_DLG_H__
#include <gtk/gtk.h>
@ -49,4 +49,4 @@ void voip_calls_dlg_update(GList *list);
void voip_calls_dlg_draw(void *ptr);
void voip_calls_dlg_reset(void *ptr);
#endif /* VOIP_CALLS_DLG_H_INCLUDED*/
#endif /* __VOIP_CALLS_DLG_H__ */