From fc939751370c63913f0b7b3f0f3ce0450d398f33 Mon Sep 17 00:00:00 2001 From: morriss Date: Tue, 1 Nov 2011 01:23:10 +0000 Subject: Remove comma at the end of several enumerator lists. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39700 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-bt-utp.c | 4 ++-- epan/dissectors/packet-cip.h | 4 ++-- epan/dissectors/packet-fip.c | 6 +++--- epan/dissectors/packet-ieee80211.c | 6 +++--- epan/dissectors/packet-ieee802154.c | 2 +- epan/dissectors/packet-image-gif.c | 2 +- epan/dissectors/packet-ipv6.c | 2 +- epan/dissectors/packet-mip6.c | 4 ++-- epan/dissectors/packet-nfs.c | 4 ++-- epan/dissectors/packet-tcp.c | 2 +- epan/dissectors/packet-vnc.c | 4 ++-- epan/dissectors/packet-wifi-p2p.c | 10 +++++----- epan/uat.h | 6 +++--- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index 78422587d2..719681c911 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -36,7 +36,7 @@ enum { ST_STATE = 2, ST_RESET = 3, ST_SYN = 4, - ST_NUM_STATES, + ST_NUM_STATES }; /* V0 hdr: "flags"; V1 hdr: "type" */ @@ -53,7 +53,7 @@ enum { EXT_NO_EXTENSION = 0, EXT_SELECTION_ACKS = 1, EXT_EXTENSION_BITS = 2, - EXT_NUM_EXT, + EXT_NUM_EXT }; static const value_string bt_utp_extension_type_vals[] = { diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index b821f58d9b..bf289f393b 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -247,10 +247,10 @@ enum cip_datatype { cip_date_and_time, cip_string2, cip_stringN, - cip_stringi, + cip_stringi }; -typedef int attribute_dissector_func(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +typedef int attribute_dissector_func(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len); typedef struct attribute_info { diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 6bcf4bd285..ba54280b54 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -62,7 +62,7 @@ enum fip_opcode { FIP_OP_LS = 2, /* Link Service request or reply */ FIP_OP_CTRL = 3, /* control */ FIP_OP_VLAN = 4, /* VLAN request or reply */ - FIP_OP_VN2VN = 5, /* VN_port to VN_port operation */ + FIP_OP_VN2VN = 5 /* VN_port to VN_port operation */ }; /* @@ -100,7 +100,7 @@ enum fip_vn2vn_subcode { FIP_SC_VN_PROBE_REP = 2, /* probe reply */ FIP_SC_VN_CLAIM_NOTIFY = 3, /* claim notification */ FIP_SC_VN_CLAIM_REP = 4, /* claim response */ - FIP_SC_VN_BEACON = 5, /* beacon */ + FIP_SC_VN_BEACON = 5 /* beacon */ }; static const value_string fip_opcodes[] = { @@ -163,7 +163,7 @@ enum fip_desc_type { FIP_DT_FKA = 12, /* FIP keep-alive / advert. period */ FIP_DT_VEND = 13, /* Vendor-specific TLV */ FIP_DT_VLAN = 14, /* VLAN number */ - FIP_DT_FC4F = 15, /* FC-4 features */ + FIP_DT_FC4F = 15 /* FC-4 features */ }; static const value_string fip_desc_types[] = { diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 0c80e5bec6..c3f9ef476f 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6160,15 +6160,15 @@ dissect_vendor_ie_marvell(proto_item * item _U_, proto_tree * ietree, typedef enum { ATHEROS_IE_ADVCAP = 1, - ATHEROS_IE_XR = 3, + ATHEROS_IE_XR = 3 } atheros_ie_type_t; typedef enum { - ATHEROS_IE_ADVCAP_S = 1, + ATHEROS_IE_ADVCAP_S = 1 } atheros_ie_advcap_subtype_t; typedef enum { - ATHEROS_IE_XR_S = 1, + ATHEROS_IE_XR_S = 1 } atheros_ie_xr_subtype_t; typedef enum { diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 362a603053..6bbc459813 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -195,7 +195,7 @@ typedef enum { DECRYPT_PACKET_NO_EXT_SRC_ADDR, DECRYPT_PACKET_NO_KEY, DECRYPT_PACKET_DECRYPT_FAILED, - DECRYPT_PACKET_MIC_CHECK_FAILED, + DECRYPT_PACKET_MIC_CHECK_FAILED } ws_decrypt_status; static tvbuff_t * dissect_ieee802154_decrypt(tvbuff_t *, guint, packet_info *, ieee802154_packet *, diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index 63e39add7f..752ec1ba84 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -81,7 +81,7 @@ static const value_string vals_extensions[] = { enum { GIF_87a = 0x87, - GIF_89a = 0x89, + GIF_89a = 0x89 }; /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 084fdab5ea..e2927aee72 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -557,7 +557,7 @@ enum { IPv6_RT_HEADER_SOURCE_ROUTING=0, IPv6_RT_HEADER_NIMROD, IPv6_RT_HEADER_MobileIP, - IPv6_RT_HEADER_RPL=4, + IPv6_RT_HEADER_RPL=4 }; /* Routeing Header Types */ diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 3f4d3f3b55..351af9b927 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -59,7 +59,7 @@ typedef enum { MIP6_HB = 13, MIP6_HI = 14, MIP6_HAck = 15, - MIP6_BR = 16, + MIP6_BR = 16 } mhTypes; /* http://www.iana.org/assignments/mobility-parameters/mobility-parameters.xhtml */ @@ -134,7 +134,7 @@ typedef enum { MIP6_MNLLAII = 42, /* 42 Mobile Node Link-local Address Interface Identifier Option [RFC5949] */ MIP6_TB = 43, /* 43 Transient Binding [RFC-ietf-mipshop-transient-bce-pmipv6-07] */ MIP6_FS = 44, /* 44 Flow Summary Mobility Option [RFC-ietf-mext-flow-binding-11] */ - MIP6_FI = 45, /* 45 Flow Identification Mobility Option [RFC-ietf-mext-flow-binding-11]] */ + MIP6_FI = 45 /* 45 Flow Identification Mobility Option [RFC-ietf-mext-flow-binding-11]] */ } optTypes; diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index a29a9893c2..b12ed8344e 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -8957,7 +8957,7 @@ enum channel_dir_from_client4 { CDFC4_FORE = 0x1, CDFC4_BACK = 0x2, CDFC4_FORE_OR_BOTH = 0x3, - CDFC4_BACK_OR_BOTH = 0x7, + CDFC4_BACK_OR_BOTH = 0x7 }; static const value_string names_channel_dir_from_client[] = { @@ -8971,7 +8971,7 @@ static const value_string names_channel_dir_from_client[] = { enum channel_dir_from_server4 { CDFS4_FORE = 0x1, CDFS4_BACK = 0x2, - CDFS4_BOTH = 0x3, + CDFS4_BOTH = 0x3 }; static const value_string names_channel_dir_from_server[] = { diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index c91fd9ecda..2171adcbf7 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3176,7 +3176,7 @@ enum { TRPY_DST_ADDR_OFFSET = 8, TRPY_SRC_PORT_OFFSET = 12, TRPY_DST_PORT_OFFSET = 14, - TRPY_CLIENT_PORT_OFFSET = 16, + TRPY_CLIENT_PORT_OFFSET = 16 }; /* Trpy Flags */ diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 131d1fddd6..55ca47dfae 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -104,7 +104,7 @@ typedef enum { VNC_CLIENT_MESSAGE_TYPE_FRAMEBUF_UPDATE_REQ = 3, VNC_CLIENT_MESSAGE_TYPE_KEY_EVENT = 4, VNC_CLIENT_MESSAGE_TYPE_POINTER_EVENT = 5, - VNC_CLIENT_MESSAGE_TYPE_CLIENT_CUT_TEXT = 6, + VNC_CLIENT_MESSAGE_TYPE_CLIENT_CUT_TEXT = 6 } vnc_client_message_types_e; static const value_string vnc_client_message_types_vs[] = { @@ -121,7 +121,7 @@ typedef enum { VNC_SERVER_MESSAGE_TYPE_FRAMEBUFFER_UPDATE = 0, VNC_SERVER_MESSAGE_TYPE_SET_COLORMAP_ENTRIES = 1, VNC_SERVER_MESSAGE_TYPE_RING_BELL = 2, - VNC_SERVER_MESSAGE_TYPE_CUT_TEXT = 3, + VNC_SERVER_MESSAGE_TYPE_CUT_TEXT = 3 } vnc_server_message_types_e; static const value_string vnc_server_message_types_vs[] = { diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 72e47d638e..9638e0e558 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -52,7 +52,7 @@ enum { P2P_ATTR_OPERATING_CHANNEL = 17, P2P_ATTR_INVITATION_FLAGS = 18, /* 19-220 Reserved */ - P2P_ATTR_VENDOR_SPECIFIC = 221, + P2P_ATTR_VENDOR_SPECIFIC = 221 /* 222-255 Reserved */ }; @@ -115,7 +115,7 @@ enum { P2P_ACT_DEV_DISC_REQ = 5, P2P_ACT_DEV_DISC_RESP = 6, P2P_ACT_PROV_DISC_REQ = 7, - P2P_ACT_PROV_DISC_RESP = 8, + P2P_ACT_PROV_DISC_RESP = 8 }; static const value_string p2p_public_action_subtypes[] = { @@ -135,7 +135,7 @@ enum { P2P_ACT_NOA = 0, P2P_ACT_P2P_PRESENCE_REQ = 1, P2P_ACT_P2P_PRESENCE_RESP = 2, - P2P_ACT_GO_DISC_REQ = 3, + P2P_ACT_GO_DISC_REQ = 3 }; static const value_string p2p_action_subtypes[] = { @@ -158,7 +158,7 @@ enum { P2P_FAIL_UNKNOWN_P2P_GROUP = 8, P2P_FAIL_BOTH_DEVICES_GO = 9, P2P_FAIL_INCOMPATIBLE_PROVISION_METHOD = 10, - P2P_FAIL_REJECTED_BY_USER = 11, + P2P_FAIL_REJECTED_BY_USER = 11 }; static const value_string p2p_status_codes[] = { @@ -186,7 +186,7 @@ enum { P2P_MINOR_DISCONNECT_DUE_TO_CROSS_CONNECTION = 1, P2P_MINOR_DISCONNECT_DUE_TO_NOT_P2P_MANAGED = 2, P2P_MINOR_DISCONNECT_DUE_TO_NO_COEXISTENCE = 3, - P2P_MINOR_DISCONNECT_DUE_TO_OUTSIDE_POLICY = 4, + P2P_MINOR_DISCONNECT_DUE_TO_OUTSIDE_POLICY = 4 }; static const value_string p2p_minor_reason_codes[] = { diff --git a/epan/uat.h b/epan/uat.h index 7c4424f361..90a8cde9fa 100644 --- a/epan/uat.h +++ b/epan/uat.h @@ -186,7 +186,7 @@ typedef enum _uat_text_mode_t { PT_TXTMOD_FILENAME, /* processed like a PT_TXTMOD_STRING, but shows a filename dialog */ - PT_TXTMOD_DIRECTORYNAME, + PT_TXTMOD_DIRECTORYNAME /* processed like a PT_TXTMOD_STRING, but shows a directory dialog */ } uat_text_mode_t; @@ -234,7 +234,7 @@ typedef struct _uat_field_t { * @param filename The filename to be used (either in userdir or datadir) * @param from_profile TRUE if profie directory to be used * @param data_ptr A pointer to a null terminated array of pointers to the data - * @param num_items_ptr + * @param num_items_ptr * @param category * @param help A pointer to help text * @param copy_cb A function that copies the data in the struct @@ -386,7 +386,7 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out {#field_name, title, PT_TXTMOD_DIRECTORYNAME,{uat_fld_chk_str,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL} /* - * OID - just a CSTRING with a specific check routine + * OID - just a CSTRING with a specific check routine */ #define UAT_FLD_OID(basename,field_name,title,desc) \ {#field_name, title, PT_TXTMOD_STRING,{uat_fld_chk_oid,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL} -- cgit v1.2.3