Message ID | 32A38822-9A7D-4FE3-B9CE-F399F3043680@me.com |
---|---|
State | Accepted |
Headers | show |
On Mon, Dec 19, 2016 at 04:46:42PM -0600, Joel Cunningham wrote: > wpa_cipher_to_alg returns enumerated values from enum wpa_alg and all > uses of the return value treat it as enum wpa_alg (by either assigning > it to a variable of type enum wpa_alg or passing to a function that > expects enum wpa_alg) > > This commit updates the return value to match the expected usage > (enum wpa_alg) rather than int. This ensures the return value is > of the proper type and elimantes the following compiler warnings: > > ARM RVCT (2.2): > 'Warning: #188-D: enumerated type mixed with another type' Thanks, applied.
diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c index a87210e..ea1f4ed 100644 --- a/src/common/wpa_common.c +++ b/src/common/wpa_common.c @@ -1621,7 +1621,7 @@ int wpa_cipher_rsc_len(int cipher) } -int wpa_cipher_to_alg(int cipher) +enum wpa_alg wpa_cipher_to_alg(int cipher) { switch (cipher) { case WPA_CIPHER_CCMP_256: diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h index 6d28417..b48c24e 100644 --- a/src/common/wpa_common.h +++ b/src/common/wpa_common.h @@ -437,7 +437,7 @@ int wpa_ft_parse_ies(const u8 *ies, size_t ies_len, struct wpa_ft_ies *parse); int wpa_cipher_key_len(int cipher); int wpa_cipher_rsc_len(int cipher); -int wpa_cipher_to_alg(int cipher); +enum wpa_alg wpa_cipher_to_alg(int cipher); int wpa_cipher_valid_group(int cipher); int wpa_cipher_valid_pairwise(int cipher); int wpa_cipher_valid_mgmt_group(int cipher);