Fix wpa_cipher_to_alg() return type

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 eliminates the following compiler warnings:

ARM RVCT (2.2):
  'Warning: #188-D: enumerated type mixed with another type'

Signed-off-by: Joel Cunningham <joel.cunningham@me.com>
This commit is contained in:
Joel Cunningham 2016-12-19 16:34:24 -06:00 committed by Jouni Malinen
parent 0c8d7b085c
commit 04f02faac4
2 changed files with 2 additions and 2 deletions

View file

@ -1620,7 +1620,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) { switch (cipher) {
case WPA_CIPHER_CCMP_256: case WPA_CIPHER_CCMP_256:

View file

@ -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_key_len(int cipher);
int wpa_cipher_rsc_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_group(int cipher);
int wpa_cipher_valid_pairwise(int cipher); int wpa_cipher_valid_pairwise(int cipher);
int wpa_cipher_valid_mgmt_group(int cipher); int wpa_cipher_valid_mgmt_group(int cipher);