diff mbox series

[v2,1/2] wpa_cli: Fix duplicate const warning

Message ID 1517709037-5015-1-git-send-email-masashi.honma@gmail.com
State Superseded
Headers show
Series [v2,1/2] wpa_cli: Fix duplicate const warning | expand

Commit Message

Masashi Honma Feb. 4, 2018, 1:50 a.m. UTC 
wpa_cli.c:1541:19: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
 static const char const *cred_fields[] = {
                   ^~~~~

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---
 wpa_supplicant/wpa_cli.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

Comments

Jouni Malinen Feb. 4, 2018, 9:59 a.m. UTC | #1 
On Sun, Feb 04, 2018 at 10:50:36AM +0900, Masashi Honma wrote:
> wpa_cli.c:1541:19: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
>  static const char const *cred_fields[] = {
>                    ^~~~~

That was supposed to be const char * const..

>  static char ** wpa_cli_complete_cred(const char *str, int pos)
>  {
>  	int arg = get_cmd_arg_num(str, pos);
> -	int i, num_fields = ARRAY_SIZE(cred_fields);
> +	const char *fields[] = {

And this is not..

Anyway, like I already indicated in the previous reply, I'll fix the
declaration correctly (the commit is already there in the pending
branch).
diff mbox series

Patch

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 7d2d6ac..6b98a3f 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -1538,22 +1538,21 @@  static int wpa_cli_cmd_remove_cred(struct wpa_ctrl *ctrl, int argc,
 }
 
 
-static const char const *cred_fields[] = {
-	"temporary", "priority", "sp_priority", "pcsc", "eap",
-	"update_identifier", "min_dl_bandwidth_home", "min_ul_bandwidth_home",
-	"min_dl_bandwidth_roaming", "min_ul_bandwidth_roaming", "max_bss_load",
-	"req_conn_capab", "ocsp", "sim_num", "realm", "username", "password",
-	"ca_cert", "client_cert", "private_key", "private_key_passwd", "imsi",
-	"milenage", "domain_suffix_match", "domain", "phase1", "phase2",
-	"roaming_consortium", "required_roaming_consortium", "excluded_ssid",
-	"roaming_partner", "provisioning_sp"
-};
-
-
 static char ** wpa_cli_complete_cred(const char *str, int pos)
 {
 	int arg = get_cmd_arg_num(str, pos);
-	int i, num_fields = ARRAY_SIZE(cred_fields);
+	const char *fields[] = {
+		"temporary", "priority", "sp_priority", "pcsc", "eap",
+		"update_identifier", "min_dl_bandwidth_home",
+		"min_ul_bandwidth_home", "min_dl_bandwidth_roaming",
+		"min_ul_bandwidth_roaming", "max_bss_load", "req_conn_capab",
+		"ocsp", "sim_num", "realm", "username", "password", "ca_cert",
+		"client_cert", "private_key", "private_key_passwd", "imsi",
+		"milenage", "domain_suffix_match", "domain", "phase1", "phase2",
+		"roaming_consortium", "required_roaming_consortium",
+		"excluded_ssid", "roaming_partner", "provisioning_sp"
+	};
+	int i, num_fields = ARRAY_SIZE(fields);
 	char **res = NULL;
 
 	switch (arg) {
@@ -1565,7 +1564,7 @@  static char ** wpa_cli_complete_cred(const char *str, int pos)
 		if (res == NULL)
 			return NULL;
 		for (i = 0; i < num_fields; i++) {
-			res[i] = os_strdup(cred_fields[i]);
+			res[i] = os_strdup(fields[i]);
 			if (res[i] == NULL)
 				break;
 		}