diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-25 19:18:13 +0000 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-11-26 12:35:30 +0000 |
commit | edb33883032ed8af3ca33df4250d7a12f2f48b53 (patch) | |
tree | e025a7c08806b5bf2d55b3aba2ca1d1fc4324390 | |
parent | 3cb5d94018225a466154a5d22e31f67ce24312a0 (diff) |
Fix ISO C restricts enumerator values to range of 'int' [-Wpedantic]
Change-Id: I0609d1920038feb47eae9cef9bce2ee80f9720b7
Reviewed-on: https://code.wireshark.org/review/12160
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/packet-ceph.c | 108 | ||||
-rw-r--r-- | epan/dissectors/packet-pathport.c | 252 | ||||
-rw-r--r-- | epan/dissectors/packet-vnc.c | 10 |
3 files changed, 175 insertions, 195 deletions
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index f67a9c446a..8b74ba6802 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -846,65 +846,59 @@ enum c_banner { /** Feature Flags */ /* Transmuted from ceph:/src/include/ceph_features.h */ -typedef enum _c_features { - C_FEATURE_UID = 1U << 0, - C_FEATURE_NOSRCADDR = 1U << 1, - C_FEATURE_MONCLOCKCHECK = 1U << 2, - C_FEATURE_FLOCK = 1U << 3, - C_FEATURE_SUBSCRIBE2 = 1U << 4, - C_FEATURE_MONNAMES = 1U << 5, - C_FEATURE_RECONNECT_SEQ = 1U << 6, - C_FEATURE_DIRLAYOUTHASH = 1U << 7, - C_FEATURE_OBJECTLOCATOR = 1U << 8, - C_FEATURE_PGID64 = 1U << 9, - C_FEATURE_INCSUBOSDMAP = 1U << 10, - C_FEATURE_PGPOOL3 = 1U << 11, - C_FEATURE_OSDREPLYMUX = 1U << 12, - C_FEATURE_OSDENC = 1U << 13, - C_FEATURE_OMAP = 1U << 14, - C_FEATURE_MONENC = 1U << 15, - C_FEATURE_QUERY_T = 1U << 16, - C_FEATURE_INDEP_PG_MAP = 1U << 17, - C_FEATURE_CRUSH_TUNABLES = 1U << 18, - C_FEATURE_CHUNKY_SCRUB = 1U << 19, - C_FEATURE_MON_NULLROUTE = 1U << 20, - C_FEATURE_MON_GV = 1U << 21, - C_FEATURE_BACKFILL_RESERVATION = 1U << 22, - C_FEATURE_MSG_AUTH = 1U << 23, - C_FEATURE_RECOVERY_RESERVATION = 1U << 24, - C_FEATURE_CRUSH_TUNABLES2 = 1U << 25, - C_FEATURE_CREATEPOOLID = 1U << 26, - C_FEATURE_REPLY_CREATE_INODE = 1U << 27, - C_FEATURE_OSD_HBMSGS = 1U << 28, - C_FEATURE_MDSENC = 1U << 29, - C_FEATURE_OSDHASHPSPOOL = 1U << 30, - C_FEATURE_MON_SINGLE_PAXOS = 1U << 31, - C_FEATURE_OSD_SNAPMAPPER = 1U << 0, - C_FEATURE_MON_SCRUB = 1U << 1, - C_FEATURE_OSD_PACKED_RECOVERY = 1U << 2, - C_FEATURE_OSD_CACHEPOOL = 1U << 3, - C_FEATURE_CRUSH_V2 = 1U << 4, - C_FEATURE_EXPORT_PEER = 1U << 5, - C_FEATURE_OSD_ERASURE_CODES = 1U << 6, - C_FEATURE_OSD_TMAP2OMAP = 1U << 6, - C_FEATURE_OSDMAP_ENC = 1U << 7, - C_FEATURE_MDS_INLINE_DATA = 1U << 8, - C_FEATURE_CRUSH_TUNABLES3 = 1U << 9, - C_FEATURE_OSD_PRIMARY_AFFINITY = 1U << 9, - C_FEATURE_MSGR_KEEPALIVE2 = 1U << 10, - C_FEATURE_RESERVED = 1U << 31 -} c_features; +#define C_FEATURE_UID (1U << 0) +#define C_FEATURE_NOSRCADDR (1U << 1) +#define C_FEATURE_MONCLOCKCHECK (1U << 2) +#define C_FEATURE_FLOCK (1U << 3) +#define C_FEATURE_SUBSCRIBE2 (1U << 4) +#define C_FEATURE_MONNAMES (1U << 5) +#define C_FEATURE_RECONNECT_SEQ (1U << 6) +#define C_FEATURE_DIRLAYOUTHASH (1U << 7) +#define C_FEATURE_OBJECTLOCATOR (1U << 8) +#define C_FEATURE_PGID64 (1U << 9) +#define C_FEATURE_INCSUBOSDMAP (1U << 10) +#define C_FEATURE_PGPOOL3 (1U << 11) +#define C_FEATURE_OSDREPLYMUX (1U << 12) +#define C_FEATURE_OSDENC (1U << 13) +#define C_FEATURE_OMAP (1U << 14) +#define C_FEATURE_MONENC (1U << 15) +#define C_FEATURE_QUERY_T (1U << 16) +#define C_FEATURE_INDEP_PG_MAP (1U << 17) +#define C_FEATURE_CRUSH_TUNABLES (1U << 18) +#define C_FEATURE_CHUNKY_SCRUB (1U << 19) +#define C_FEATURE_MON_NULLROUTE (1U << 20) +#define C_FEATURE_MON_GV (1U << 21) +#define C_FEATURE_BACKFILL_RESERVATION (1U << 22) +#define C_FEATURE_MSG_AUTH (1U << 23) +#define C_FEATURE_RECOVERY_RESERVATION (1U << 24) +#define C_FEATURE_CRUSH_TUNABLES2 (1U << 25) +#define C_FEATURE_CREATEPOOLID (1U << 26) +#define C_FEATURE_REPLY_CREATE_INODE (1U << 27) +#define C_FEATURE_OSD_HBMSGS (1U << 28) +#define C_FEATURE_MDSENC (1U << 29) +#define C_FEATURE_OSDHASHPSPOOL (1U << 30) +#define C_FEATURE_MON_SINGLE_PAXOS (1U << 31) +#define C_FEATURE_OSD_SNAPMAPPER (1U << 0) +#define C_FEATURE_MON_SCRUB (1U << 1) +#define C_FEATURE_OSD_PACKED_RECOVERY (1U << 2) +#define C_FEATURE_OSD_CACHEPOOL (1U << 3) +#define C_FEATURE_CRUSH_V2 (1U << 4) +#define C_FEATURE_EXPORT_PEER (1U << 5) +#define C_FEATURE_OSD_ERASURE_CODES (1U << 6) +#define C_FEATURE_OSD_TMAP2OMAP (1U << 6) +#define C_FEATURE_OSDMAP_ENC (1U << 7) +#define C_FEATURE_MDS_INLINE_DATA (1U << 8) +#define C_FEATURE_CRUSH_TUNABLES3 (1U << 9) +#define C_FEATURE_OSD_PRIMARY_AFFINITY (1U << 9) +#define C_FEATURE_MSGR_KEEPALIVE2 (1U << 10) +#define C_FEATURE_RESERVED (1U << 31) /** Connect Message Flags */ -typedef enum _c_flags { - C_FLAG_LOSSY = 1U << 0 -} c_flags; - -typedef enum _c_pgpool_flags { - C_PGPOOL_FLAG_HASHPSPOOL = 1U << 0, /* hash pg seed and pool together (instead of adding) */ - C_PGPOOL_FLAG_FULL = 1U << 1, /* pool is full */ - C_PGPOOL_FLAG_FAKE_EC_POOL = 1U << 2 /* require ReplicatedPG to act like an EC pg */ -} c_pgpool_flags; +#define C_FLAG_LOSSY (1U << 0) + +#define C_PGPOOL_FLAG_HASHPSPOOL (1U << 0) /* hash pg seed and pool together (instead of adding) */ +#define C_PGPOOL_FLAG_FULL (1U << 1) /* pool is full */ +#define C_PGPOOL_FLAG_FAKE_EC_POOL (1U << 2) /* require ReplicatedPG to act like an EC pg */ /** Macros to create value_stings. * diff --git a/epan/dissectors/packet-pathport.c b/epan/dissectors/packet-pathport.c index 1907f95875..bfbeab1e53 100644 --- a/epan/dissectors/packet-pathport.c +++ b/epan/dissectors/packet-pathport.c @@ -78,26 +78,20 @@ static int hf_pp_pid_len = -1; static int hf_pp_pid_value = -1; static int hf_pp_pid_pad_bytes = -1; -/* Begin field and enum declarations */ -enum -{ - PP_ID_BCAST = 0xffffffff, - PP_ID_MCAST_ALL = 0xefffedff, - PP_ID_MCAST_DATA = 0xefffed01, - PP_ID_MCAST_MANAGE = 0xefffed02 -}; +/* Begin field and constant declarations */ +#define PP_ID_BCAST 0xffffffff +#define PP_ID_MCAST_ALL 0xefffedff +#define PP_ID_MCAST_DATA 0xefffed01 +#define PP_ID_MCAST_MANAGE 0xefffed02 /* Top Level PDU Types */ -enum -{ - PP_ARP_REQUEST = 0x0301, - PP_ARP_REPLY = 0x0302, - PP_ARP_INFO = 0x0303, - PP_GET = 0x0222, - PP_GET_REPLY = 0x0223, - PP_DATA = 0x0100, - PP_SET = 0x0400 -}; +#define PP_ARP_REQUEST 0x0301 +#define PP_ARP_REPLY 0x0302 +#define PP_ARP_INFO 0x0303 +#define PP_GET 0x0222 +#define PP_GET_REPLY 0x0223 +#define PP_DATA 0x0100 +#define PP_SET 0x0400 static const value_string pp_pdu_vals[] = { {PP_ARP_REQUEST, "ARP Request"}, @@ -111,11 +105,8 @@ static const value_string pp_pdu_vals[] = { }; /* XDMX Data Transport Encodings */ -enum -{ - PP_DATA_FLAT = 0x0101, - PP_DATA_RELEASE = 0x0103 -}; +#define PP_DATA_FLAT 0x0101 +#define PP_DATA_RELEASE 0x0103 /** Data encoding strings. */ static const value_string pp_data_encoding_vals[] = { @@ -134,115 +125,112 @@ static const value_string ednet_id_vals[] = { }; /* Configuration Property IDs */ -enum - { - PP_PAD = 0x0000, - PP_NODE_NAME = 0x0401, - PP_PORT_NAME = 0x0411, - PP_PATCH_NAME = 0x0412, - PP_PORT_SPEED = 0x0413, - PP_IS_BIDIRECTIONAL = 0x0414, - PP_IS_PHYSICAL = 0x0415, - PP_IS_MALE = 0x0416, - PP_IS_SINK = 0x0417, - PP_XDMX_COUNT = 0x0418, - PP_ALT_START_CODE = 0x041A, - PP_MAX_PATCHES = 0x041B, - PP_NUM_PATCHES = 0x041C, - PP_TERMINATED = 0x041E, - PP_INPUT_PRIORITY = 0x041F, - PP_INPUT_PRIORITY_CHANNEL = 0x0420, - PP_MAC = 0x0421, - PP_IP = 0x0422, - PP_NETMASK = 0x0423, - PP_ROUTER = 0x0424, - PP_PP_ID = 0x0461, - PP_PP_ID_MASK = 0x0462, - PP_PP_TX_DATA_DST = 0x0463, - PP_BACKLIGHT = 0x0481, - PP_SW_VERSION = 0x0482, - PP_HW_TYPE = 0x0483, - PP_LOADER_VERSION = 0x0484, - PP_IDENTIFY = 0x0485, - PP_IRENABLE = 0x0486, - PP_SERIAL = 0x0487, - PP_KEYPAD_LOCKOUT = 0x0488, - PP_ARTNET_RX_ENABLE = 0x0489, - PP_TX_PROTOCOL = 0x048a, - PP_SHOWNET_RX_ENABLE = 0x048b, - PP_LED_INTENSITY = 0x048c, - PP_JUMPER_CONFIGURED = 0x048d, - PP_SACN_RX_ENABLE = 0x048e, - PP_NET2_RX_ENABLE = 0x048f, - PP_PATHPORT_RX_ENABLE = 0x0490, - PP_SACN_IS_DRAFT = 0x0491, - PP_REBOOT = 0x04a1, - PP_BOOTORDER = 0x04a2, - PP_FACTORY_DEFAULT = 0x04a4, - PP_TEST_LCD = 0x04c1, - PP_IS_TERMINAL_BLOCK = 0x04c2, - PP_IS_RACK_MOUNTED = 0x04c3, - PP_IS_ENABLED = 0x04c4, - PP_IS_DMX_ACTIVE = 0x04c5, - PP_IS_XDMX_ACTIVE = 0x04c6, - PP_SIGNAL_LOSS_HOLD_TIME = 0x04c7, - PP_SIGNAL_LOSS_HOLD_FOREVER = 0x04c8, - PP_SIGNAL_LOSS_FADE_ENABLE = 0x04c9, - PP_SIGNAL_LOSS_FADE_TIME = 0x04ca, - PP_SIGNAL_LOSS_PORT_SHUTDOWN = 0x04cb, - PP_NET2_ADMIN_MCAST = 0x04ce, - PP_NET2_DATA_MCAST = 0x04cf, - PP_ROOMS_FEATURES = 0x04d0, - PP_UNIVERSE_TEMP = 0x04d1, - PP_CROSSFADE_TIME = 0x04d2, - PP_CROSSFADE_ENABLE = 0x04d3, - PP_IGNORE_INPUT_PRI = 0x04d4, - PP_ARTNET_ALT_MAP = 0x04d5, - PP_PATCH_CRC = 0x04d6, - PP_CONF_CHANGE = 0x04d7, - PP_PORT_ACTIVE_SUMMARY = 0x04d8, - PP_SUPPORTED_UNIV = 0x04d9, - PP_INPUT_HLL_TIME = 0x04da, - PP_PCP_ENABLE = 0x04db, - PP_INPUT_UNIVERSE = 0x04dc, - PP_MODEL_NAME = 0x04dd, - PP_MANUF_NAME = 0x04de, - PP_VER_STR = 0x04df, - PP_SERIAL_STR = 0x04e0, - PP_NODE_NOTES = 0x04e1, - PP_PORT_NOTES = 0x04e2, - PP_USER_NODE_ID = 0x04e3, - PP_MDG_GEN_STATE = 0x0601, - PP_EMBEDDED_ID = 0x0602, - PP_SLAVE_DMX_START = 0x0603, - PP_TB_MODE = 0x0605, - PP_LINK_MODE = 0x0701, - PP_LINK_STATUS = 0x0702, - PP_CONNECTED_COUNT = 0x0703, - PP_POE_STATUS = 0x0704, - PP_POE_EXTERN_WATT = 0x0705, - PP_POE_CURRENT_WATT = 0x0706, - PP_SFP_MODULE_TYPE = 0x0707, - PP_POE_EXTERN_PRESENT = 0x0708, - PP_POE_CAPABLE = 0x0709, - PP_SWITCH_PORT_TYPE = 0x070a, - PP_POE_MAX_ALLOC_MW = 0x070b, - PP_POE_CURRENT_ALLOC_MW = 0x070c, - PP_VLAN_RANGE_START = 0x070d, - PP_VLAN_RANGE_END = 0x070e, - PP_VLAN_IS_TAGGED = 0x070f, - PP_VLAN_PORT_VID = 0x0710, - PP_VLAN_MGMT_VID = 0x0711, - PP_VLAN_ENABLE = 0x0712, - PP_EAPS_MODE = 0x0713, - PP_EAPS_VLAN = 0x0714, - PP_EAPS_PRI_PORT = 0x0715, - PP_EAPS_SEC_PORT = 0x0716, - PP_LLDP_PARTNER_MAC = 0x0717, - PP_LLDP_PARTNER_PORT = 0x0718, - PP_ET_PARAM_1 = 0x1101, - PP_END = 0xffff -}; +#define PP_PAD 0x0000 +#define PP_NODE_NAME 0x0401 +#define PP_PORT_NAME 0x0411 +#define PP_PATCH_NAME 0x0412 +#define PP_PORT_SPEED 0x0413 +#define PP_IS_BIDIRECTIONAL 0x0414 +#define PP_IS_PHYSICAL 0x0415 +#define PP_IS_MALE 0x0416 +#define PP_IS_SINK 0x0417 +#define PP_XDMX_COUNT 0x0418 +#define PP_ALT_START_CODE 0x041A +#define PP_MAX_PATCHES 0x041B +#define PP_NUM_PATCHES 0x041C +#define PP_TERMINATED 0x041E +#define PP_INPUT_PRIORITY 0x041F +#define PP_INPUT_PRIORITY_CHANNEL 0x0420 +#define PP_MAC 0x0421 +#define PP_IP 0x0422 +#define PP_NETMASK 0x0423 +#define PP_ROUTER 0x0424 +#define PP_PP_ID 0x0461 +#define PP_PP_ID_MASK 0x0462 +#define PP_PP_TX_DATA_DST 0x0463 +#define PP_BACKLIGHT 0x0481 +#define PP_SW_VERSION 0x0482 +#define PP_HW_TYPE 0x0483 +#define PP_LOADER_VERSION 0x0484 +#define PP_IDENTIFY 0x0485 +#define PP_IRENABLE 0x0486 +#define PP_SERIAL 0x0487 +#define PP_KEYPAD_LOCKOUT 0x0488 +#define PP_ARTNET_RX_ENABLE 0x0489 +#define PP_TX_PROTOCOL 0x048a +#define PP_SHOWNET_RX_ENABLE 0x048b +#define PP_LED_INTENSITY 0x048c +#define PP_JUMPER_CONFIGURED 0x048d +#define PP_SACN_RX_ENABLE 0x048e +#define PP_NET2_RX_ENABLE 0x048f +#define PP_PATHPORT_RX_ENABLE 0x0490 +#define PP_SACN_IS_DRAFT 0x0491 +#define PP_REBOOT 0x04a1 +#define PP_BOOTORDER 0x04a2 +#define PP_FACTORY_DEFAULT 0x04a4 +#define PP_TEST_LCD 0x04c1 +#define PP_IS_TERMINAL_BLOCK 0x04c2 +#define PP_IS_RACK_MOUNTED 0x04c3 +#define PP_IS_ENABLED 0x04c4 +#define PP_IS_DMX_ACTIVE 0x04c5 +#define PP_IS_XDMX_ACTIVE 0x04c6 +#define PP_SIGNAL_LOSS_HOLD_TIME 0x04c7 +#define PP_SIGNAL_LOSS_HOLD_FOREVER 0x04c8 +#define PP_SIGNAL_LOSS_FADE_ENABLE 0x04c9 +#define PP_SIGNAL_LOSS_FADE_TIME 0x04ca +#define PP_SIGNAL_LOSS_PORT_SHUTDOWN 0x04cb +#define PP_NET2_ADMIN_MCAST 0x04ce +#define PP_NET2_DATA_MCAST 0x04cf +#define PP_ROOMS_FEATURES 0x04d0 +#define PP_UNIVERSE_TEMP 0x04d1 +#define PP_CROSSFADE_TIME 0x04d2 +#define PP_CROSSFADE_ENABLE 0x04d3 +#define PP_IGNORE_INPUT_PRI 0x04d4 +#define PP_ARTNET_ALT_MAP 0x04d5 +#define PP_PATCH_CRC 0x04d6 +#define PP_CONF_CHANGE 0x04d7 +#define PP_PORT_ACTIVE_SUMMARY 0x04d8 +#define PP_SUPPORTED_UNIV 0x04d9 +#define PP_INPUT_HLL_TIME 0x04da +#define PP_PCP_ENABLE 0x04db +#define PP_INPUT_UNIVERSE 0x04dc +#define PP_MODEL_NAME 0x04dd +#define PP_MANUF_NAME 0x04de +#define PP_VER_STR 0x04df +#define PP_SERIAL_STR 0x04e0 +#define PP_NODE_NOTES 0x04e1 +#define PP_PORT_NOTES 0x04e2 +#define PP_USER_NODE_ID 0x04e3 +#define PP_MDG_GEN_STATE 0x0601 +#define PP_EMBEDDED_ID 0x0602 +#define PP_SLAVE_DMX_START 0x0603 +#define PP_TB_MODE 0x0605 +#define PP_LINK_MODE 0x0701 +#define PP_LINK_STATUS 0x0702 +#define PP_CONNECTED_COUNT 0x0703 +#define PP_POE_STATUS 0x0704 +#define PP_POE_EXTERN_WATT 0x0705 +#define PP_POE_CURRENT_WATT 0x0706 +#define PP_SFP_MODULE_TYPE 0x0707 +#define PP_POE_EXTERN_PRESENT 0x0708 +#define PP_POE_CAPABLE 0x0709 +#define PP_SWITCH_PORT_TYPE 0x070a +#define PP_POE_MAX_ALLOC_MW 0x070b +#define PP_POE_CURRENT_ALLOC_MW 0x070c +#define PP_VLAN_RANGE_START 0x070d +#define PP_VLAN_RANGE_END 0x070e +#define PP_VLAN_IS_TAGGED 0x070f +#define PP_VLAN_PORT_VID 0x0710 +#define PP_VLAN_MGMT_VID 0x0711 +#define PP_VLAN_ENABLE 0x0712 +#define PP_EAPS_MODE 0x0713 +#define PP_EAPS_VLAN 0x0714 +#define PP_EAPS_PRI_PORT 0x0715 +#define PP_EAPS_SEC_PORT 0x0716 +#define PP_LLDP_PARTNER_MAC 0x0717 +#define PP_LLDP_PARTNER_PORT 0x0718 +#define PP_ET_PARAM_1 0x1101 +#define PP_END 0xffff /** Property strings. */ static const value_string pp_pid_vals[] = { diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 5208614f19..7dafb4eb9f 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -456,12 +456,10 @@ typedef enum { VNC_SESSION_STATE_NORMAL_TRAFFIC } vnc_session_state_e; -typedef enum { - VNC_FENCE_BLOCK_BEFORE = 0x00000001, - VNC_FENCE_BLOCK_AFTER = 0x00000002, - VNC_FENCE_SYNC_NEXT = 0x00000004, - VNC_FENCE_REQUEST = 0x80000000 -} vnc_fence_flags_e; +#define VNC_FENCE_BLOCK_BEFORE 0x00000001 +#define VNC_FENCE_BLOCK_AFTER 0x00000002 +#define VNC_FENCE_SYNC_NEXT 0x00000004 +#define VNC_FENCE_REQUEST 0x80000000 /* This structure will be tied to each conversation. */ typedef struct { |