diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-04-06 19:28:39 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-04-06 17:56:49 +0000 |
commit | 5a67479bff973df068301e5d07ec8918a58f3ce8 (patch) | |
tree | 67c5a38747fc34d243b56b0700721f0988ba455e /epan | |
parent | 85aa07157a072f6627b019b18ec7e769844f3930 (diff) |
Fix indent (use 2 spaces) and add modelinse info for frame_data.h
Change-Id: Ib9eced1b652345cd40edb96ddde092f41a8f669c
Reviewed-on: https://code.wireshark.org/review/986
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/frame_data.c | 8 | ||||
-rw-r--r-- | epan/frame_data.h | 17 |
2 files changed, 19 insertions, 6 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c index 3cf4056908..5b933efc3c 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -59,7 +59,7 @@ p_compare(gconstpointer a, gconstpointer b) return 1; }else if (ap -> key == bp -> key){ return 0; - } + } return -1; }else{ return -1; @@ -142,12 +142,12 @@ p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int pro gchar * p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index){ - frame_proto_data *temp; + frame_proto_data *temp; if (scope == pinfo->pool) { - temp = (frame_proto_data*)g_slist_nth_data(pinfo->proto_data, pfd_index); + temp = (frame_proto_data*)g_slist_nth_data(pinfo->proto_data, pfd_index); } else { - temp = (frame_proto_data*)g_slist_nth_data(pinfo->fd->pfd, pfd_index); + temp = (frame_proto_data*)g_slist_nth_data(pinfo->fd->pfd, pfd_index); } return ep_strdup_printf("[%s, key %u]",proto_get_protocol_name(temp->proto), temp->key); diff --git a/epan/frame_data.h b/epan/frame_data.h index 8c953ca07d..9722f094c2 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -49,8 +49,8 @@ struct wtap_pkthdr; /* Types of character encodings */ typedef enum { - PACKET_CHAR_ENC_CHAR_ASCII = 0, /* ASCII */ - PACKET_CHAR_ENC_CHAR_EBCDIC = 1 /* EBCDIC */ + PACKET_CHAR_ENC_CHAR_ASCII = 0, /* ASCII */ + PACKET_CHAR_ENC_CHAR_EBCDIC = 1 /* EBCDIC */ } packet_char_enc; /** The frame number is the ordinal number of the frame in the capture, so @@ -119,3 +119,16 @@ WS_DLL_PUBLIC void frame_data_set_after_dissect(frame_data *fdata, /** @} */ #endif /* __FRAME_DATA__ */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ |