Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 18:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1152702 - Fix upper bounds of ContiguousEnumSerializer for BluetoothStatus and BluetoothSspVariant. r=tzimmermann

Browse Source
This commit is contained in:
Jocelyn Liu 2015-04-10 17:00:02 +08:00
parent aeb7edf346
commit 17b99b7b84
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/bluetooth/bluetooth2/BluetoothCommon.h
View File

@ -238,7 +238,8 @@ enum BluetoothStatus {
STATUS_PARM_INVALID,
STATUS_UNHANDLED,
STATUS_AUTH_FAILURE,
STATUS_RMT_DEV_DOWN
STATUS_RMT_DEV_DOWN,
NUM_STATUS
};
enum BluetoothBondState {
@ -287,7 +288,8 @@ enum BluetoothSspVariant {
SSP_VARIANT_PASSKEY_CONFIRMATION,
SSP_VARIANT_PASSKEY_ENTRY,
SSP_VARIANT_CONSENT,
SSP_VARIANT_PASSKEY_NOTIFICATION
SSP_VARIANT_PASSKEY_NOTIFICATION,
NUM_SSP_VARIANT
};
struct BluetoothActivityEnergyInfo {
@ -470,8 +472,7 @@ enum BluetoothObjectType {
TYPE_MANAGER = 0,
TYPE_ADAPTER = 1,
TYPE_DEVICE = 2,
TYPE_INVALID
NUM_TYPE
};
enum BluetoothA2dpAudioState {

6
dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
View File

@ -17,7 +17,7 @@ struct ParamTraits<mozilla::dom::bluetooth::BluetoothObjectType>
: public ContiguousEnumSerializer<
mozilla::dom::bluetooth::BluetoothObjectType,
mozilla::dom::bluetooth::TYPE_MANAGER,
mozilla::dom::bluetooth::TYPE_INVALID>
mozilla::dom::bluetooth::NUM_TYPE>
{ };
template <>
@ -25,7 +25,7 @@ struct ParamTraits<mozilla::dom::bluetooth::BluetoothSspVariant>
: public ContiguousEnumSerializer<
mozilla::dom::bluetooth::BluetoothSspVariant,
mozilla::dom::bluetooth::SSP_VARIANT_PASSKEY_CONFIRMATION,
mozilla::dom::bluetooth::SSP_VARIANT_PASSKEY_NOTIFICATION>
mozilla::dom::bluetooth::NUM_SSP_VARIANT>
{ };
template <>
@ -33,7 +33,7 @@ struct ParamTraits<mozilla::dom::bluetooth::BluetoothStatus>
: public ContiguousEnumSerializer<
mozilla::dom::bluetooth::BluetoothStatus,
mozilla::dom::bluetooth::STATUS_SUCCESS,
mozilla::dom::bluetooth::STATUS_RMT_DEV_DOWN>
mozilla::dom::bluetooth::NUM_STATUS>
{ };
template <>