diff options
author | JackLivio <jack@livio.io> | 2018-09-24 16:03:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-24 16:03:58 -0400 |
commit | 461f76b129e998d4b60540491684c348dd5c27e2 (patch) | |
tree | 5b3f7c8106894e6d8ad533634ac8e0cbf633bc73 | |
parent | 9136f4f9d181228642a7f64e32a474c2b6acbdd2 (diff) | |
download | sdl_core-461f76b129e998d4b60540491684c348dd5c27e2.tar.gz |
Fix ReadDID Typo (#2630)
* Fix ReadDID Typo
* Remove Reserved from external enums
* Remove Reserved from regular enums
-rw-r--r-- | src/components/policy/policy_external/src/policy_table/enums.cc | 7 | ||||
-rw-r--r-- | src/components/policy/policy_regular/src/policy_table/enums.cc | 13 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc index 6410cb79de..27db505e3f 100644 --- a/src/components/policy/policy_external/src/policy_table/enums.cc +++ b/src/components/policy/policy_external/src/policy_table/enums.cc @@ -841,11 +841,6 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result) { } bool EnumFromJsonString(const std::string& literal, FunctionID* result) { - if ("RESERVE" == literal) { - *result = RESERVED; - return true; - } - if ("RegisterAppInterface" == literal) { *result = RegisterAppInterfaceID; return true; @@ -956,7 +951,7 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) { return true; } - if ("ReadD" == literal) { + if ("ReadDID" == literal) { *result = ReadDIDID; return true; } diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc index ec92d064da..428e18d0bd 100644 --- a/src/components/policy/policy_regular/src/policy_table/enums.cc +++ b/src/components/policy/policy_regular/src/policy_table/enums.cc @@ -711,8 +711,6 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result) { bool IsValidEnum(FunctionID val) { switch (val) { - case RESERVED: - return true; case RegisterAppInterfaceID: return true; case UnregisterAppInterfaceID: @@ -860,8 +858,6 @@ bool IsValidEnum(FunctionID val) { const char* EnumToJsonString(FunctionID val) { switch (val) { - case RESERVED: - return "RESERVE"; case RegisterAppInterfaceID: return "RegisterAppInterface"; case UnregisterAppInterfaceID: @@ -907,7 +903,7 @@ const char* EnumToJsonString(FunctionID val) { case GetVehicleDataID: return "GetVehicleData"; case ReadDIDID: - return "ReadD"; + return "ReadDID"; case GetDTCsID: return "GetDTCs"; case ScrollableMessageID: @@ -1008,11 +1004,6 @@ const char* EnumToJsonString(FunctionID val) { }; bool EnumFromJsonString(const std::string& literal, FunctionID* result) { - if ("RESERVE" == literal) { - *result = RESERVED; - return true; - } - if ("RegisterAppInterface" == literal) { *result = RegisterAppInterfaceID; return true; @@ -1123,7 +1114,7 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) { return true; } - if ("ReadD" == literal) { + if ("ReadDID" == literal) { *result = ReadDIDID; return true; } |