From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <07CD099E-959E-4F85-B7B6-72F025E64545@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_59383CD9-7DF2-4B3F-AFD6-F3C7FA13A9C8";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH] e2fsck: map PROMPT_* values to prompt messages
Date:   Thu, 9 Dec 2021 14:55:26 -0700
In-Reply-To: <20211208164238.GA69182@magnolia>
Cc:     Theodore Ts'o <tytso@mit.edu>,
        linux-ext4 <linux-ext4@vger.kernel.org>
To:     "Darrick J. Wong" <djwong@kernel.org>
References: <20211208075112.85649-1-adilger@dilger.ca>
 <20211208164238.GA69182@magnolia>
Precedence: bulk


--Apple-Mail=_59383CD9-7DF2-4B3F-AFD6-F3C7FA13A9C8
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

On Dec 8, 2021, at 9:42 AM, Darrick J. Wong <djwong@kernel.org> wrote:
> 
> On Wed, Dec 08, 2021 at 12:51:12AM -0700, Andreas Dilger wrote:
>> It isn't totally clear when searching the code for PROMPT_*
>> constants from problem codes where these messages come from.
>> Similarly, there isn't a direct mapping from the prompt string
>> to the constant.
>> 
>> Add comments that make this mapping more clear.
>> 
>> Signed-off-by: Andreas Dilger <adilger@dilger.ca>
>> ---
>> e2fsck/problem.c | 46 +++++++++++++++++++++++-----------------------
>> 1 file changed, 23 insertions(+), 23 deletions(-)
>> 
>> diff --git a/e2fsck/problem.c b/e2fsck/problem.c
>> index 757b5d56..2d02468c 100644
>> --- a/e2fsck/problem.c
>> +++ b/e2fsck/problem.c
>> @@ -50,29 +50,29 @@
>>  * to fix a problem.
>>  */
>> static const char *prompt[] = {
>> -	N_("(no prompt)"),	/* 0 */
>> -	N_("Fix"),		/* 1 */
>> -	N_("Clear"),		/* 2 */
>> -	N_("Relocate"),		/* 3 */
>> -	N_("Allocate"),		/* 4 */
>> -	N_("Expand"),		/* 5 */
>> -	N_("Connect to /lost+found"), /* 6 */
>> -	N_("Create"),		/* 7 */
>> -	N_("Salvage"),		/* 8 */
>> -	N_("Truncate"),		/* 9 */
>> -	N_("Clear inode"),	/* 10 */
>> -	N_("Abort"),		/* 11 */
>> -	N_("Split"),		/* 12 */
>> -	N_("Continue"),		/* 13 */
>> -	N_("Clone multiply-claimed blocks"), /* 14 */
>> -	N_("Delete file"),	/* 15 */
>> -	N_("Suppress messages"),/* 16 */
>> -	N_("Unlink"),		/* 17 */
>> -	N_("Clear HTree index"),/* 18 */
>> -	N_("Recreate"),		/* 19 */
>> -	N_("Optimize"),		/* 20 */
>> -	N_("Clear flag"),	/* 21 */
>> -	"",			/* 22 */
>> +	N_("(no prompt)"),			/* PROMPT_NONE		=  0 */
> 
> Why not make it even clearer and mismerge proof:
> 
> static const char *prompt[] = {
> 	[0]		= N_("(no prompt")),	/* null value test */
> 	[PROMPT_FIX]	= N_("Fix"),		/* 1 */
> 	[PROMPT_CLEAR]	= N_("Clear"),		/* 2 */
> 	...
> };

I thought about that too, but then I thought the "[index] = foo" designated
initializer is GNU or at least C99-specific, and I wondered if that was
going to cause portability problems for some ancient system that e2fsprogs
is building on...  I figured adding comments is relatively safe, and these
values change so rarely that more complexity in the patch was not a win.

Cheers, Andreas


--Apple-Mail=_59383CD9-7DF2-4B3F-AFD6-F3C7FA13A9C8
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAmGye08ACgkQcqXauRfM
H+BHzA/+KBDpbQTyEGmYaxfX7bkECnadLg5zA4R3S1lK/1NFhopYgNN9h8Pxr7ry
X/4HHOAnmjFkJsl22FpcctKiMI5XMxJFFkdKzkw7uuy8/Diuhdue7Olcbovpf5fi
cVzmgl4c6fX4PffIaQuKVh9TMBxwgWL9KzRlPic0PmCzp7lZr1+mznPQnvIXxCis
REWgcRx+pOHKKFZXcOY32XkL5Ryj+ypYOs8WWP8luqPstsHKIMBokd/lbt3do/no
5H/aM9lx3pjGuclm8dg1XTjOm/7HjXDmiKWw+2M9jL/0NBRBO5y7/nOZCq4h5Emo
iUlaPe8+LT72iAXnu8vjqMhkvr1tdIWjDYAehj8cz4yoWlKml+1ZE0QfqHJL9voW
sQjzKdVMuRyEJW3dNdtimXeaOR5JJYXh9tUQL+5qkQoDpMaJqFgcxu9UXNwjsUQl
LBRM2ipKblkn4x1j2Ok0HaY0Fx2yiOPbey4Z7kZGaMbm+RJvuQudLagY+uRAH2dF
GPoJW01VxYfCjYcILBX3iUREb2beHWFdlhEFb4/zantYSCtEL351H+blf4Gbb4+7
puCN2nBhLQQwSnvsySLOzVkZbnwr0pJgQTDUMXCs2hr+2uTUf58JGN0dclHhMXZT
9MlsyVddvfIU3MHnKDMNi7mIb4hVrwNIQAgmKCVp0pypWdr+B40=
=CbFB
-----END PGP SIGNATURE-----

--Apple-Mail=_59383CD9-7DF2-4B3F-AFD6-F3C7FA13A9C8--