linux-kernel - Re: [PATCH 20/22 v2] ray_cs: Replace comments with C99 initializers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <683c72536c0672aa69c285ee505ec552fa76935f.camel@perches.com>
Date:   Mon, 28 Mar 2022 12:23:41 -0700
From:   Joe Perches <joe@...ches.com>
To:     Benjamin Stürz <benni@...erz.xyz>,
        Kalle Valo <kvalo@...nel.org>
Cc:     kuba@...nel.org, davem@...emloft.net, pabeni@...hat.com,
        linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH 20/22 v2] ray_cs: Replace comments with C99 initializers

On Mon, 2022-03-28 at 20:21 +0200, Benjamin Stürz wrote:
> Replace comments with C99's designated initializers.
[]
> diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
[]
> @@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
>  #define MAXDATA (PAGE_SIZE - 80)
> 
>  static const char *card_status[] = {
> -	"Card inserted - uninitialized",	/* 0 */
> -	"Card not downloaded",			/* 1 */
> -	"Waiting for download parameters",	/* 2 */
> -	"Card doing acquisition",		/* 3 */
> -	"Acquisition complete",			/* 4 */
> -	"Authentication complete",		/* 5 */
> -	"Association complete",			/* 6 */
> -	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
> -	"Card init error",			/* 11 */
> -	"Download parameters error",		/* 12 */
> -	"???",					/* 13 */
> -	"Acquisition failed",			/* 14 */
> -	"Authentication refused",		/* 15 */
> -	"Association failed"			/* 16 */
> +	[0]  = "Card inserted - uninitialized",

If you are going to do this at all, please use the #defines
in drivers/net/wireless/rayctl.h

	[CARD_INSERTED] = "Card inserted - uninitialized",
	[CARD_AWAITING_PARAM] = "Card not downloaded",

etc...

$ git grep -w -P 'CARD_\w+' drivers/net/wireless/rayctl.h
drivers/net/wireless/rayctl.h:#define CARD_INSERTED       (0)
drivers/net/wireless/rayctl.h:#define CARD_AWAITING_PARAM (1)
drivers/net/wireless/rayctl.h:#define CARD_INIT_ERROR     (11)
drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM       (2)
drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM_ERROR (12)
drivers/net/wireless/rayctl.h:#define CARD_DOING_ACQ      (3)
drivers/net/wireless/rayctl.h:#define CARD_ACQ_COMPLETE   (4)
drivers/net/wireless/rayctl.h:#define CARD_ACQ_FAILED     (14)
drivers/net/wireless/rayctl.h:#define CARD_AUTH_COMPLETE  (5)
drivers/net/wireless/rayctl.h:#define CARD_AUTH_REFUSED   (15)
drivers/net/wireless/rayctl.h:#define CARD_ASSOC_COMPLETE (6)
drivers/net/wireless/rayctl.h:#define CARD_ASSOC_FAILED   (16)

> +	[1]  = "Card not downloaded",
> +	[2]  = "Waiting for download parameters",
> +	[3]  = "Card doing acquisition",
> +	[4]  = "Acquisition complete",
> +	[5]  = "Authentication complete",
> +	[6]  = "Association complete",
> +	[7]  = "???",
> +	[8]  = "???",
> +	[9]  = "???",
> +	[10] = "???",
> +	[11] = "Card init error",
> +	[12] = "Download parameters error",
> +	[13] = "???",
> +	[14] = "Acquisition failed",
> +	[15] = "Authentication refused",
> +	[16] = "Association failed"
>  };
> 
>  static const char *nettype[] = { "Adhoc", "Infra " };