| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 8a236330f2af56bde21e9f69208ea3e59f529f0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 15 Mar 2020 17:02:30 -0700 |
| 4 | Subject: [PATCH] typecast enum conversions explicitly |
| 5 | |
| 6 | clang complains like below |
| 7 | |
| 8 | libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] |
| 9 | supported_boards[i].working = binfo[i].working; |
| 10 | ~ ~~~~~~~~~^~~~~~~ |
| 11 | libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] |
| 12 | supported_chipsets[i].status = chipset[i].status; |
| 13 | ~ ~~~~~~~~~~~^~~~~~ |
| 14 | |
| 15 | However these enums are exactly same so they can be typecasted |
| 16 | |
| 17 | libflashrom.h |
| 18 | |
| 19 | /** @ingroup flashrom-query */ |
| 20 | enum flashrom_test_state { |
| 21 | FLASHROM_TESTED_OK = 0, |
| 22 | FLASHROM_TESTED_NT = 1, |
| 23 | FLASHROM_TESTED_BAD = 2, |
| 24 | FLASHROM_TESTED_DEP = 3, |
| 25 | FLASHROM_TESTED_NA = 4, |
| 26 | }; |
| 27 | |
| 28 | flash.h |
| 29 | |
| 30 | enum test_state { |
| 31 | OK = 0, |
| 32 | NT = 1, /* Not tested */ |
| 33 | BAD, /* Known to not work */ |
| 34 | DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ |
| 35 | NA, /* Not applicable (e.g. write support on ROM chips) */ |
| 36 | }; |
| 37 | |
| 38 | Upstream-Status: Pending |
| 39 | |
| 40 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 41 | --- |
| 42 | libflashrom.c | 4 ++-- |
| 43 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 44 | |
| 45 | diff --git a/libflashrom.c b/libflashrom.c |
| 46 | index 0dec22e..7956685 100644 |
| 47 | --- a/libflashrom.c |
| 48 | +++ b/libflashrom.c |
| 49 | @@ -188,7 +188,7 @@ struct flashrom_board_info *flashrom_supported_boards(void) |
| 50 | for (; i < boards_known_size; ++i) { |
| 51 | supported_boards[i].vendor = binfo[i].vendor; |
| 52 | supported_boards[i].name = binfo[i].name; |
| 53 | - supported_boards[i].working = binfo[i].working; |
| 54 | + supported_boards[i].working = (enum flashrom_test_state)binfo[i].working; |
| 55 | } |
| 56 | } else { |
| 57 | msg_gerr("Memory allocation error!\n"); |
| 58 | @@ -226,7 +226,7 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) |
| 59 | supported_chipsets[i].chipset = chipset[i].device_name; |
| 60 | supported_chipsets[i].vendor_id = chipset[i].vendor_id; |
| 61 | supported_chipsets[i].chipset_id = chipset[i].device_id; |
| 62 | - supported_chipsets[i].status = chipset[i].status; |
| 63 | + supported_chipsets[i].status = (enum flashrom_test_state)chipset[i].status; |
| 64 | } |
| 65 | } else { |
| 66 | msg_gerr("Memory allocation error!\n"); |
| 67 | -- |
| 68 | 2.25.1 |
| 69 | |