osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix warnings: comma at end of enumerator list. 

svn path=/trunk/; revision=50640
This commit is contained in:
Chris Maynard 2013-07-15 21:37:55 +00:00
parent 1c19a0d61e
commit e37533ced7
12 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-9p.c
View File

@ -157,7 +157,7 @@ enum _9p_msg_t {
_9P_TSTAT = 124,
_9P_RSTAT,
_9P_TWSTAT = 126,
_9P_RWSTAT,
_9P_RWSTAT
};
/* 9P Msg types to name mapping */
@ -311,7 +311,7 @@ enum _9p_qid_t {
_9P_QTTMP = 0x04,
_9P_QTSYMLINK = 0x02,
_9P_QTLINK = 0x01,
_9P_QTFILE = 0x00,
_9P_QTFILE = 0x00
};
/* 9P Magic Numbers */

2
epan/dissectors/packet-foundry.c
View File

@ -90,7 +90,7 @@ typedef enum {
FDP_TYPE_VERSION = 5,
FDP_TYPE_MODEL = 6,
FDP_TYPE_VLANMAP = 0x0101,
FDP_TYPE_TAG = 0x0102,
FDP_TYPE_TAG = 0x0102
} fdp_type_t;
static const value_string fdp_type_vals[] = {

2
epan/dissectors/packet-gmr1_common.h
View File

@ -45,7 +45,7 @@ typedef enum {
GMR1_PD_RR = 0x06,
GMR1_PD_GMM = 0x08,
GMR1_PD_SM = 0x0a,
GMR1_PD_DTRS = 0x1e,
GMR1_PD_DTRS = 0x1e
} gmr1_pd_e;
#define GMR1_PD_EXT_MSK 0x0f

46
epan/dissectors/packet-gsm_abis_oml.c
View File

@ -158,7 +158,7 @@ enum abis_nm_msgtype {
NM_MT_SET_ALARM_THRES_NACK,
NM_MT_IPACC_RESTART = 0x87,
NM_MT_IPACC_RESTART_ACK,
NM_MT_IPACC_RESTART_ACK
};
enum abis_nm_msgtype_bs11 {
@ -193,7 +193,7 @@ enum abis_nm_msgtype_bs11 {
NM_MT_BS11_LMT_LOGOFF = 0xec,
NM_MT_BS11_LMT_LOGOFF_ACK,
NM_MT_BS11_RECONNECT = 0xf1,
NM_MT_BS11_RECONNECT_ACK,
NM_MT_BS11_RECONNECT_ACK
};
enum abis_nm_msgtype_ipacc {
@ -227,12 +227,12 @@ enum abis_nm_msgtype_ipacc {
NM_MT_IPACC_SW_DEACT_NACK,
NM_MT_IPACC_MEAS_RES_REQ_NACK = 0xfc,
NM_MT_IPACC_START_MEAS_NACK,
NM_MT_IPACC_STOP_MEAS_NACK,
NM_MT_IPACC_STOP_MEAS_NACK
};
enum abis_nm_bs11_cell_alloc {
NM_BS11_CANR_GSM = 0x00,
NM_BS11_CANR_DCS1800 = 0x01,
NM_BS11_CANR_DCS1800 = 0x01
};
/* Section 9.2: Object Class */
@ -258,7 +258,7 @@ enum abis_nm_obj_class {
NM_OC_GPRS_NSVC0 = 0xf2,
NM_OC_GPRS_NSVC1 = 0xf3,
NM_OC_NULL = 0xff,
NM_OC_NULL = 0xff
};
/* Section 9.4: Attributes */
@ -334,7 +334,7 @@ enum abis_nm_attr {
NM_ATT_OUTST_ALARM,
NM_ATT_FILE_DATA,
NM_ATT_MEAS_RES,
NM_ATT_MEAS_TYPE,
NM_ATT_MEAS_TYPE
};
enum abis_nm_attr_bs11 {
@ -409,7 +409,7 @@ enum abis_nm_attr_bs11 {
NM_ATT_BS11_RX_OFFSET = 0xf3,
NM_ATT_BS11_ANT_TYPE = 0xf4,
NM_ATT_BS11_PLL_MODE = 0xfc,
NM_ATT_BS11_PASSWORD = 0xfd,
NM_ATT_BS11_PASSWORD = 0xfd
};
enum abis_nm_attr_ipa {
@ -461,7 +461,7 @@ enum abis_nm_attr_ipa {
NM_ATT_IPACC_SSL_CFG = 0xad,
NM_ATT_IPACC_SEC_POSSIBLE = 0xae,
NM_ATT_IPACC_IML_SSL_STATE = 0xaf,
NM_ATT_IPACC_REVOC_DATE = 0xb0,
NM_ATT_IPACC_REVOC_DATE = 0xb0
};
/* Section 9.4.4: Administrative State */
@ -469,7 +469,7 @@ enum abis_nm_adm_state {
NM_STATE_LOCKED = 0x01,
NM_STATE_UNLOCKED = 0x02,
NM_STATE_SHUTDOWN = 0x03,
NM_STATE_NULL = 0xff,
NM_STATE_NULL = 0xff
};
/* Section 9.4.13: Channel Combination */
@ -482,7 +482,7 @@ enum abis_nm_chan_comb {
NM_CHANC_BCCHComb = 0x05,
NM_CHANC_BCCH = 0x06,
NM_CHANC_BCCH_CBCH = 0x07,
NM_CHANC_SDCCH_CBCH = 0x08,
NM_CHANC_SDCCH_CBCH = 0x08
};
/* Section 9.4.16: Event Type */
@ -491,7 +491,7 @@ enum abis_nm_event_type {
NM_EVT_QOS_FAIL = 0x01,
NM_EVT_PROC_FAIL = 0x02,
NM_EVT_EQUIP_FAIL = 0x03,
NM_EVT_ENV_FAIL = 0x04,
NM_EVT_ENV_FAIL = 0x04
};
/* Section: 9.4.63: Perceived Severity */
@ -501,14 +501,14 @@ enum abis_nm_severity {
NM_SEVER_MAJOR = 0x02,
NM_SEVER_MINOR = 0x03,
NM_SEVER_WARNING = 0x04,
NM_SEVER_INDETERMINATE = 0x05,
NM_SEVER_INDETERMINATE = 0x05
};
/* Section 9.4.43: Probable Cause Type */
enum abis_nm_pcause_type {
NM_PCAUSE_T_X721 = 0x01,
NM_PCAUSE_T_GSM = 0x02,
NM_PCAUSE_T_MANUF = 0x03,
NM_PCAUSE_T_MANUF = 0x03
};
/* Section 9.4.36: NACK Causes */
@ -546,7 +546,7 @@ enum abis_nm_nack_cause {
NM_NACK_WAIT = 0x29,
NM_NACK_NOTH_REPORT_EXIST = 0x2a,
NM_NACK_MEAS_NOTSUPP = 0x2b,
NM_NACK_MEAS_NOTSTART = 0x2c,
NM_NACK_MEAS_NOTSTART = 0x2c
};
/* Section 9.4.1 */
@ -565,7 +565,7 @@ enum abis_bs11_objtype {
BS11_OBJ_CCLK = 0x04,
BS11_OBJ_GPSU = 0x06,
BS11_OBJ_LI = 0x07,
BS11_OBJ_PA = 0x09, /* obj_class: 0, 1*/
BS11_OBJ_PA = 0x09 /* obj_class: 0, 1*/
};
enum abis_bs11_trx_power {
@ -576,12 +576,12 @@ enum abis_bs11_trx_power {
BS11_TRX_POWER_DCS_3W = 0x0a,
BS11_TRX_POWER_DCS_1W6 = 0x0b,
BS11_TRX_POWER_DCS_500mW= 0x0c,
BS11_TRX_POWER_DCS_160mW= 0x0d,
BS11_TRX_POWER_DCS_160mW= 0x0d
};
enum abis_bs11_li_pll_mode {
BS11_LI_PLL_LOCKED = 2,
BS11_LI_PLL_STANDALONE = 3,
BS11_LI_PLL_STANDALONE = 3
};
enum abis_bs11_phase {
@ -597,7 +597,7 @@ enum abis_bs11_phase {
BS11_STATE_LOAD_MBCCU = 0x92,
BS11_STATE_WAIT_MIN_CFG_2 = 0xA2,
BS11_STATE_NORMAL = 0x03,
BS11_STATE_ABIS_LOAD = 0x13,
BS11_STATE_ABIS_LOAD = 0x13
};
/* From openbsc/include/openbsc/tlv.h */
@ -608,7 +608,7 @@ enum tlv_type {
TLV_TYPE_TV,
TLV_TYPE_TLV,
TLV_TYPE_TL16V,
TLV_TYPE_TLV16,
TLV_TYPE_TLV16
};
struct tlv_def {
@ -630,7 +630,7 @@ enum abis_nm_ipacc_test_no {
NM_IPACC_TESTNO_BCCH_INFO = 0x43,
NM_IPACC_TESTNO_TX_BEACON = 0x44,
NM_IPACC_TESTNO_SYSINFO_MONITOR = 0x45,
NM_IPACC_TESTNO_BCCCH_MONITOR = 0x46,
NM_IPACC_TESTNO_BCCCH_MONITOR = 0x46
};
/* first byte after length inside NM_ATT_TEST_REPORT */
@ -639,7 +639,7 @@ enum abis_nm_ipacc_test_res {
NM_IPACC_TESTRES_TIMEOUT = 1,
NM_IPACC_TESTRES_NO_CHANS = 2,
NM_IPACC_TESTRES_PARTIAL = 3,
NM_IPACC_TESTRES_STOPPED = 4,
NM_IPACC_TESTRES_STOPPED = 4
};
/* internal IE inside NM_ATT_TEST_REPORT */
@ -648,7 +648,7 @@ enum abis_nm_ipacc_testres_ie {
NM_IPACC_TR_IE_CHAN_USAGE = 4,
NM_IPACC_TR_IE_BCCH_INFO = 6,
NM_IPACC_TR_IE_RESULT_DETAILS = 8,
NM_IPACC_TR_IE_FREQ_ERR = 18,
NM_IPACC_TR_IE_FREQ_ERR = 18
};
/* initialize the protocol and registered fields */
@ -731,7 +731,7 @@ enum {
OML_DIALECT_ETSI,
OML_DIALECT_SIEMENS,
OML_DIALECT_IPA,
OML_DIALECT_ERICSSON,
OML_DIALECT_ERICSSON
};
/* which A-bis OML dialect to use (prefrence) */

2
epan/dissectors/packet-mip6.c
View File

@ -172,7 +172,7 @@ typedef enum {
MIP6_ALT_IP4_CO= 49, /* 49 Alternate IPv4 Care-of Address [RFC6463] */
MIP6_MNG = 50, /* 50 Mobile Node Group Identifier [RFC6602] */
MIP6_MAG_IPv6 = 51, /* 51 MAG IPv6 Address [RFC6705] */
MIP6_ACC_NET_ID= 52, /* 52 Access Network Identifier [RFC6757] */
MIP6_ACC_NET_ID= 52 /* 52 Access Network Identifier [RFC6757] */
} optTypes;

2
epan/dissectors/packet-mp2t.c
View File

@ -297,7 +297,7 @@ enum pid_payload_type {
pid_pload_docsis,
pid_pload_pes,
pid_pload_sect,
pid_pload_null,
pid_pload_null
};
typedef struct subpacket_analysis_data {

2
epan/dissectors/packet-nflog.c
View File

@ -49,7 +49,7 @@ enum ws_nfulnl_attr_type {
WS_NFULA_GID, /* group id of socket */
WS_NFULA_HWTYPE, /* hardware type */
WS_NFULA_HWHEADER, /* hardware header */
WS_NFULA_HWLEN, /* hardware header length */
WS_NFULA_HWLEN /* hardware header length */
};
#define BYTE_ORDER_AUTO 0

4
epan/dissectors/packet-ptpip.h
View File

@ -412,7 +412,7 @@ typedef enum {
/* Proprietary vendor extension operations mask */
PTP_OC_EXTENSION_MASK = 0xF000,
PTP_OC_EXTENSION = 0x9000,
PTP_OC_EXTENSION = 0x9000
} ptp_opcodes;
static const value_string ptp_opcode_names[] = {
@ -772,7 +772,7 @@ typedef enum {
/* WiFi Provisioning MTP Extension Error Codes (microsoft.com/WPDWCN: 1.0) */
PTP_RC_MTP_Invalid_WFC_Syntax = 0xA121,
PTP_RC_MTP_WFC_Version_Not_Supported = 0xA122,
PTP_RC_MTP_WFC_Version_Not_Supported = 0xA122
} ptp_respcodes;

2
epan/dissectors/packet-rsl.c
View File

@ -650,7 +650,7 @@ enum tlv_type {
TLV_TYPE_T,
TLV_TYPE_TV,
TLV_TYPE_TLV,
TLV_TYPE_TL16V,
TLV_TYPE_TL16V
};
struct tlv_def {

2
epan/dissectors/packet-sdp.h
View File

@ -34,7 +34,7 @@ enum sdp_exchange_type
{
SDP_EXCHANGE_OFFER = 0,
SDP_EXCHANGE_ANSWER_ACCEPT,
SDP_EXCHANGE_ANSWER_REJECT,
SDP_EXCHANGE_ANSWER_REJECT
};
extern void setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type type, int request_frame);

2
epan/dissectors/packet-skype.c
View File

@ -103,7 +103,7 @@ typedef enum {
SKYPE_TYPE_NAT_INFO = 5,
SKYPE_TYPE_NAT_REPEAT = 7,
SKYPE_TYPE_AUDIO = 0xd,
SKYPE_TYPE_UNKNOWN_F = 0xf,
SKYPE_TYPE_UNKNOWN_F = 0xf
} skype_type_t;

2
epan/dissectors/packet-smtp.c
View File

@ -153,7 +153,7 @@ typedef enum {
SMTP_AUTH_STATE_NTLM_CHALLANGE, /* Received ntlm challange request from server */
SMTP_AUTH_STATE_NTLM_RSP, /* Received ntlm auth request from client */
SMTP_AUTH_STATE_SUCCESS, /* Password received, authentication successful, start decoding */
SMTP_AUTH_STATE_FAILED, /* authentication failed, no decoding */
SMTP_AUTH_STATE_FAILED /* authentication failed, no decoding */
} smtp_auth_state_t;
struct smtp_session_state {