[PATCH] scripts/dtc: Assign value when defining variables

[PATCH] scripts/dtc: Assign value when defining variables

[zuoqilin1]

From: zuoqilin <zuoqilin@yulong.com>

When defining variables and assigning values can be done at the same time.

Signed-off-by: zuoqilin <zuoqilin@yulong.com>
---
 scripts/dtc/util.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index 40274fb..d1f7608 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -292,7 +292,7 @@ int utilfdt_write_err(const char *filename, const void *blob)
 {
 	int fd = 1;	/* assume stdout */
 	int totalsize;
-	int offset;
+	int offset = 0;
 	int ret = 0;
 	const char *ptr = blob;
 
@@ -303,7 +303,6 @@ int utilfdt_write_err(const char *filename, const void *blob)
 	}
 
 	totalsize = fdt_totalsize(blob);
-	offset = 0;
 
 	while (offset < totalsize) {
 		ret = write(fd, ptr + offset, totalsize - offset);
@@ -421,7 +420,7 @@ void NORETURN util_usage(const char *errmsg, const char *synopsis,
 	const char a_arg[] = "<arg>";
 	size_t a_arg_len = strlen(a_arg) + 1;
 	size_t i;
-	int optlen;
+	int optlen = 0;
 
 	fprintf(fp,
 		"Usage: %s\n"
@@ -429,7 +428,6 @@ void NORETURN util_usage(const char *errmsg, const char *synopsis,
 		"Options: -[%s]\n", synopsis, short_opts);
 
 	/* prescan the --long opt length to auto-align */
-	optlen = 0;
 	for (i = 0; long_opts[i].name; ++i) {
 		/* +1 is for space between --opt and help text */
 		int l = strlen(long_opts[i].name) + 1;
-- 
1.9.1

Re: [PATCH] scripts/dtc: Assign value when defining variables

[Rob Herring]

On Tue, May 18, 2021 at 1:07 AM <zuoqilin1@163.com> wrote:
>
> From: zuoqilin <zuoqilin@yulong.com>

We don't take patches against the kernel copy of dtc. They need to go
upstream and to the devicetree-compiler list.

> When defining variables and assigning values can be done at the same time.
>
> Signed-off-by: zuoqilin <zuoqilin@yulong.com>
> ---
>  scripts/dtc/util.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
> index 40274fb..d1f7608 100644
> --- a/scripts/dtc/util.c
> +++ b/scripts/dtc/util.c
> @@ -292,7 +292,7 @@ int utilfdt_write_err(const char *filename, const void *blob)
>  {
>         int fd = 1;     /* assume stdout */
>         int totalsize;
> -       int offset;
> +       int offset = 0;
>         int ret = 0;
>         const char *ptr = blob;
>
> @@ -303,7 +303,6 @@ int utilfdt_write_err(const char *filename, const void *blob)
>         }
>
>         totalsize = fdt_totalsize(blob);
> -       offset = 0;

It is possible to exit before this point and the assignment is not
necessary if you do.

>
>         while (offset < totalsize) {
>                 ret = write(fd, ptr + offset, totalsize - offset);
> @@ -421,7 +420,7 @@ void NORETURN util_usage(const char *errmsg, const char *synopsis,
>         const char a_arg[] = "<arg>";
>         size_t a_arg_len = strlen(a_arg) + 1;
>         size_t i;
> -       int optlen;
> +       int optlen = 0;
>
>         fprintf(fp,
>                 "Usage: %s\n"
> @@ -429,7 +428,6 @@ void NORETURN util_usage(const char *errmsg, const char *synopsis,
>                 "Options: -[%s]\n", synopsis, short_opts);
>
>         /* prescan the --long opt length to auto-align */
> -       optlen = 0;

In keeping with doing the assignment as late as possible and just
before needing it, this was correct as is.

>         for (i = 0; long_opts[i].name; ++i) {
>                 /* +1 is for space between --opt and help text */
>                 int l = strlen(long_opts[i].name) + 1;
> --
> 1.9.1
>
>