[PATCH 1/2] dtc: fix missing string in usage_opts_help

[PATCH 1/2] dtc: fix missing string in usage_opts_help

[Charles Perry]

This fixes the output of the `dtc --help` command as the last few
entries were offset by one.

Signed-off-by: Charles Perry <charles.perry-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>
---
 dtc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dtc.c b/dtc.c
index d2e4e2b..775d527 100644
--- a/dtc.c
+++ b/dtc.c
@@ -107,6 +107,7 @@ static const char * const usage_opts_help[] = {
 	"\n\tEnable generation of symbols",
 	"\n\tEnable auto-alias of labels",
 	"\n\tAnnotate output .dts with input source file and line (-T -T for more details)",
+	"\n\tPossibly generates a __local_fixups__ and a __fixups__ node at the root node",
 	"\n\tPrint this help and exit",
 	"\n\tPrint version and exit",
 	NULL,
-- 
2.34.1

[PATCH 2/2] dtc: ensure that command line options arrays length match

[Charles Perry]

usage_long_opts and usage_opts_help should always have the same length.
Since these are fixed length arrays, this can be checked at compile time
with _Static_assert (requires C11).

Signed-off-by: Charles Perry <charles.perry-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>
---
 dtc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dtc.c b/dtc.c
index 775d527..2768fc6 100644
--- a/dtc.c
+++ b/dtc.c
@@ -112,6 +112,8 @@ static const char * const usage_opts_help[] = {
 	"\n\tPrint version and exit",
 	NULL,
 };
+_Static_assert(ARRAY_SIZE(usage_long_opts) == ARRAY_SIZE(usage_opts_help),
+		"usage_long_opts and usage_opts_help length differ");
 
 static const char *guess_type_by_name(const char *fname, const char *fallback)
 {
-- 
2.34.1

Re: [PATCH 1/2] dtc: fix missing string in usage_opts_help

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]

On Sun, Sep 03, 2023 at 07:00:57PM -0700, Charles Perry wrote:
> This fixes the output of the `dtc --help` command as the last few
> entries were offset by one.
> 
> Signed-off-by: Charles Perry <charles.perry-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>

Good catch, but when I apply this the descriptions still don't line up
with the correct options.  I think the new entry has been added in the
wrong order?

> ---
>  dtc.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/dtc.c b/dtc.c
> index d2e4e2b..775d527 100644
> --- a/dtc.c
> +++ b/dtc.c
> @@ -107,6 +107,7 @@ static const char * const usage_opts_help[] = {
>  	"\n\tEnable generation of symbols",
>  	"\n\tEnable auto-alias of labels",
>  	"\n\tAnnotate output .dts with input source file and line (-T -T for more details)",
> +	"\n\tPossibly generates a __local_fixups__ and a __fixups__ node at the root node",
>  	"\n\tPrint this help and exit",
>  	"\n\tPrint version and exit",
>  	NULL,

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/2] dtc: fix missing string in usage_opts_help

[Charles Perry]

On Sep 3, 2023, at 7:51 PM, David Gibson david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org wrote:

> On Sun, Sep 03, 2023 at 07:00:57PM -0700, Charles Perry wrote:
>> This fixes the output of the `dtc --help` command as the last few
>> entries were offset by one.
>> 
>> Signed-off-by: Charles Perry <charles.perry-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>
> 
> Good catch, but when I apply this the descriptions still don't line up
> with the correct options.  I think the new entry has been added in the
> wrong order?
> 

Oops! you're right, let me resubmit that patch.

>> ---
>>  dtc.c | 1 +
>>  1 file changed, 1 insertion(+)
>> 
>> diff --git a/dtc.c b/dtc.c
>> index d2e4e2b..775d527 100644
>> --- a/dtc.c
>> +++ b/dtc.c
>> @@ -107,6 +107,7 @@ static const char * const usage_opts_help[] = {
>>  	"\n\tEnable generation of symbols",
>>  	"\n\tEnable auto-alias of labels",
>>  	"\n\tAnnotate output .dts with input source file and line (-T -T for more
>>  	details)",
>> +	"\n\tPossibly generates a __local_fixups__ and a __fixups__ node at the root
>> node",
>>  	"\n\tPrint this help and exit",
>>  	"\n\tPrint version and exit",
>>  	NULL,
> 
> --
> David Gibson			| I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
>				| _way_ _around_!
> http://www.ozlabs.org/~dgibson