jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make hostapd_config_fill() easier to auto indent

Browse source 
The conditional compilation block with only the opening brace included
in two variants was messing up auto indentation in emacs. Work around
this by defining the maximum value conditionally while leave the if
block outside any conditional building rules.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-03-22 11:33:16 +02:00
parent 8ca09293ea
commit 7365eb43ea
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hostapd/config_file.c
View file

@ -2458,12 +2458,13 @@ static int hostapd_config_fill(struct hostapd_config *conf,
bss->ieee802_1x = atoi(pos); bss->ieee802_1x = atoi(pos);
} else if (os_strcmp(buf, "eapol_version") == 0) { } else if (os_strcmp(buf, "eapol_version") == 0) {
int eapol_version = atoi(pos); int eapol_version = atoi(pos);
#ifdef CONFIG_MACSEC #ifdef CONFIG_MACSEC
if (eapol_version < 1 || eapol_version > 3) { int max_ver = 3;
#else /* CONFIG_MACSEC */ #else /* CONFIG_MACSEC */
if (eapol_version < 1 || eapol_version > 2) { int max_ver = 2;
#endif /* CONFIG_MACSEC */ #endif /* CONFIG_MACSEC */
if (eapol_version < 1 || eapol_version > max_ver) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"Line %d: invalid EAPOL version (%d): '%s'.", "Line %d: invalid EAPOL version (%d): '%s'.",
line, eapol_version, pos); line, eapol_version, pos);