diff options
-rw-r--r-- | epan/dissectors/packet-s7comm_szl_ids.h | 2 | ||||
-rw-r--r-- | epan/wmem/wmem_tree.h | 16 | ||||
-rw-r--r-- | ui/export_object.h | 6 | ||||
-rw-r--r-- | ui/qt/byte_view_text.h | 12 | ||||
-rw-r--r-- | ui/qt/progress_bar.h | 4 | ||||
-rw-r--r-- | ui/recent.h | 10 | ||||
-rw-r--r-- | ui/simple_dialog.h | 8 | ||||
-rw-r--r-- | ui/tap-sequence-analysis.h | 18 |
8 files changed, 38 insertions, 38 deletions
diff --git a/epan/dissectors/packet-s7comm_szl_ids.h b/epan/dissectors/packet-s7comm_szl_ids.h index bc423efa58..cf8f670e50 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.h +++ b/epan/dissectors/packet-s7comm_szl_ids.h @@ -1,7 +1,7 @@ /* packet-s7comm_szl_ids.h * * Author: Thomas Wiens, 2014 (th.wiens@gmx.de) - * Description: Wireshark dissector for S7-Communication + * Description: Wireshark dissector for S7-Communication * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/wmem/wmem_tree.h b/epan/wmem/wmem_tree.h index 3c780714ba..e7e6b2dc34 100644 --- a/epan/wmem/wmem_tree.h +++ b/epan/wmem/wmem_tree.h @@ -108,7 +108,7 @@ void * wmem_tree_lookup32_le(wmem_tree_t *tree, guint32 key); /** case insensitive strings as keys */ -#define WMEM_TREE_STRING_NOCASE 0x00000001 +#define WMEM_TREE_STRING_NOCASE 0x00000001 /** Insert a new value under a string key. Like wmem_tree_insert32 but where the * key is a null-terminated string instead of a guint32. You may pass * WMEM_TREE_STRING_NOCASE to the flags argument in order to make it store the @@ -156,14 +156,14 @@ typedef struct _wmem_tree_key_t { * The NFS dissector handles this by providing a guint32 containing the length * as the very first item in this vector : * - * wmem_tree_key_t fhkey[3]; + * wmem_tree_key_t fhkey[3]; * - * fhlen=nns->fh_length; - * fhkey[0].length=1; - * fhkey[0].key=&fhlen; - * fhkey[1].length=fhlen/4; - * fhkey[1].key=nns->fh; - * fhkey[2].length=0; + * fhlen=nns->fh_length; + * fhkey[0].length=1; + * fhkey[0].key=&fhlen; + * fhkey[1].length=fhlen/4; + * fhkey[1].key=nns->fh; + * fhkey[2].length=0; */ WS_DLL_PUBLIC void diff --git a/ui/export_object.h b/ui/export_object.h index 44120a2573..b564fff5ce 100644 --- a/ui/export_object.h +++ b/ui/export_object.h @@ -57,11 +57,11 @@ const char *ct2ext(const char *content_type); gboolean eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data); gboolean eo_http_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *data); + const void *data); gboolean eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *data); + const void *data); gboolean eo_tftp_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *data); + const void *data); void eo_smb_cleanup(void); void eo_tftp_cleanup(void); diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h index f4f9ef378b..1b1e9a23f0 100644 --- a/ui/qt/byte_view_text.h +++ b/ui/qt/byte_view_text.h @@ -36,8 +36,8 @@ // XXX Copied from gtk/packet_panes.h typedef enum { - BYTES_HEX, - BYTES_BITS + BYTES_HEX, + BYTES_BITS } bytes_view_type; class ByteViewText : public QTextEdit @@ -81,16 +81,16 @@ private: gboolean bold_highlight_; /* data */ - packet_char_enc encoding_; /* ASCII or EBCDIC */ - bytes_view_type format_; /* bytes in hex or bytes as bits */ + packet_char_enc encoding_; /* ASCII or EBCDIC */ + bytes_view_type format_; /* bytes in hex or bytes as bits */ /* data-highlight */ int p_start_, p_end_; /* Protocol */ int f_start_, f_end_; /* Field */ int fa_start_, fa_end_; /* Field appendix */ - int per_line_; /* Number of bytes per line */ - int offset_width_; /* Byte offset field width */ + int per_line_; /* Number of bytes per line */ + int offset_width_; /* Byte offset field width */ signals: diff --git a/ui/qt/progress_bar.h b/ui/qt/progress_bar.h index e2c21a3926..aed68bd904 100644 --- a/ui/qt/progress_bar.h +++ b/ui/qt/progress_bar.h @@ -37,8 +37,8 @@ class ProgressBar; // Define the structure describing a progress dialog. struct progdlg { - ProgressBar *progress_bar; // This progress bar - QWidget *top_level_window; // Top-level window widget + ProgressBar *progress_bar; // This progress bar + QWidget *top_level_window; // Top-level window widget }; class ProgressBar : public QProgressBar diff --git a/ui/recent.h b/ui/recent.h index a87ec19f4d..fa44d69e4a 100644 --- a/ui/recent.h +++ b/ui/recent.h @@ -51,10 +51,10 @@ extern "C" { #define RECENT_KEY_REMOTE_HOST "recent.remote_host" typedef struct _col_width_data { - gint cfmt; - gchar *cfield; - gint width; - gchar xalign; + gint cfmt; + gchar *cfield; + gint width; + gchar xalign; } col_width_data; /** Defines used in col_width_data.xalign */ @@ -67,7 +67,7 @@ typedef struct _col_width_data { typedef struct recent_settings_tag { gboolean main_toolbar_show; gboolean filter_toolbar_show; - gboolean wireless_toolbar_show; + gboolean wireless_toolbar_show; gboolean airpcap_driver_check_show; gboolean packet_list_show; gboolean tree_view_show; diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h index 8a9604d518..cd42c7a074 100644 --- a/ui/simple_dialog.h +++ b/ui/simple_dialog.h @@ -65,13 +65,13 @@ typedef enum { #define ESD_BTN_QUIT_DONT_SAVE 0x80 /** Standard button combination "Ok" + "Cancel". */ -#define ESD_BTNS_OK_CANCEL (ESD_BTN_OK|ESD_BTN_CANCEL) +#define ESD_BTNS_OK_CANCEL (ESD_BTN_OK|ESD_BTN_CANCEL) /** Standard button combination "Yes" + "No". */ -#define ESD_BTNS_YES_NO (ESD_BTN_YES|ESD_BTN_NO) +#define ESD_BTNS_YES_NO (ESD_BTN_YES|ESD_BTN_NO) /** Standard button combination "Yes" + "No" + "Cancel". */ -#define ESD_BTNS_YES_NO_CANCEL (ESD_BTN_YES|ESD_BTN_NO|ESD_BTN_CANCEL) +#define ESD_BTNS_YES_NO_CANCEL (ESD_BTN_YES|ESD_BTN_NO|ESD_BTN_CANCEL) /** Standard button combination "No" + "Cancel" + "Save". */ -#define ESD_BTNS_SAVE_DONTSAVE (ESD_BTN_SAVE|ESD_BTN_DONT_SAVE) +#define ESD_BTNS_SAVE_DONTSAVE (ESD_BTN_SAVE|ESD_BTN_DONT_SAVE) #define ESD_BTNS_SAVE_DONTSAVE_CANCEL (ESD_BTN_DONT_SAVE|ESD_BTN_CANCEL|ESD_BTN_SAVE) /** Standard button combination "Quit without saving" + "Cancel" + "Save". */ #define ESD_BTNS_SAVE_QUIT_DONTSAVE_CANCEL (ESD_BTN_QUIT_DONT_SAVE|ESD_BTN_CANCEL|ESD_BTN_SAVE) diff --git a/ui/tap-sequence-analysis.h b/ui/tap-sequence-analysis.h index ab359d958f..b8d03f8bc2 100644 --- a/ui/tap-sequence-analysis.h +++ b/ui/tap-sequence-analysis.h @@ -50,19 +50,19 @@ typedef enum seq_analysis_type_ { /** defines an entry for the graph analysis */ typedef struct _seq_analysis_item { - frame_data *fd; /**< Holds the frame number and time information */ + frame_data *fd; /**< Holds the frame number and time information */ address src_addr; guint16 port_src; address dst_addr; guint16 port_dst; - gchar *frame_label; /**< the label on top of the arrow */ - gchar *time_str; /**< timestamp */ - gchar *comment; /**< a comment that appears at the right of the graph */ - guint16 conv_num; /**< the conversation number, each conversation will be colored */ - gboolean display; /**< indicate if the packet is displayed or not in the graph */ - guint16 src_node; /**< this is used by graph_analysis.c to identify the node */ - guint16 dst_node; /**< a node is an IP address that will be displayed in columns */ - guint16 line_style; /**< the arrow line width in pixels*/ + gchar *frame_label; /**< the label on top of the arrow */ + gchar *time_str; /**< timestamp */ + gchar *comment; /**< a comment that appears at the right of the graph */ + guint16 conv_num; /**< the conversation number, each conversation will be colored */ + gboolean display; /**< indicate if the packet is displayed or not in the graph */ + guint16 src_node; /**< this is used by graph_analysis.c to identify the node */ + guint16 dst_node; /**< a node is an IP address that will be displayed in columns */ + guint16 line_style; /**< the arrow line width in pixels*/ } seq_analysis_item_t; /** defines the graph analysis structure */ |