Skip to contentSkip to conversation

dfu: Avoid declaring unused variables and absent parameters

PATCH New Andy Shevchenko 5 participants 6 messages Mar 4, 2019 – Mar 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dfu: Avoid declaring unused variables and absent parameters

The compiler is not happy when neither USB nor TFTP transport for DFU defined:

cmd/dfu.c: In function ‘do_dfu’:
cmd/dfu.c:31:8: warning: unused variable ‘devstring’ [-Wunused-variable]

  char *devstring = argv[3];
        ^~~~~~~~~
cmd/dfu.c:30:8: warning: unused variable ‘interface’ [-Wunused-variable]
    char *interface = argv[2];
          ^~~~~~~~~

Surround those variables by #ifdef expression.

More serious, that comes under same circumstances, is a compilation error due to absence of macro parameter:

In file included from include/image.h:45,

                 from include/common.h:35,
                 from cmd/dfu.c:13:
include/command.h:207:24: error: expected expression before ‘,’ token
 # define _CMD_HELP(x) x,
                        ^
include/command.h:286:18: note: in expansion of macro ‘_CMD_HELP’
    _cmd, _usage, _CMD_HELP(_help) _CMD_COMPLETE(_comp) }
                  ^~~~~~~~~
include/command.h:290:3: note: in expansion of macro ‘U_BOOT_CMD_MKENT_COMPLETE’
   U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \
   ^~~~~~~~~~~~~~~~~~~~~~~~~
include/command.h:332:2: note: in expansion of macro ‘U_BOOT_CMD_COMPLETE’
  U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
  ^~~~~~~~~~~~~~~~~~~
cmd/dfu.c:70:1: note: in expansion of macro ‘U_BOOT_CMD’
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 ^~~~~~~~~~
make[1]: *** [scripts/Makefile.build:279: cmd/dfu.o] Error 1
make: *** [Makefile:1518: cmd] Error 2

Put empty string unconditionally to have macro parameter present.

Fixes 0f44d33536a5 ("dfu: Fix up the Kconfig mess")
Cc Marek Vasut <[email protected]>
---
 cmd/dfu.c | 3 +++
 1 file changed, 3 insertions(+)
cmd/dfu.c +3 -0
index 4adb91c1b0..498a30b33b 100644
@@ -27,8 +27,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_DFU_OVER_USB
 	char *usb_controller = argv[1];
 #endif
+#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP)
 	char *interface = argv[2];
 	char *devstring = argv[3];
+#endif
 
 	int ret = 0;
 #ifdef CONFIG_DFU_OVER_TFTP
@@ -67,6 +69,7 @@ done:
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 	"Device Firmware Upgrade",
+	""
 #ifdef CONFIG_DFU_OVER_USB
 #ifdef CONFIG_DFU_TIMEOUT
 	"<USB_controller> <interface> <dev> [list|timeout]\n"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 dfu: Avoid declaring unused variables and absent parameters

Quoted 10 lines · Andy Shevchenko

The compiler is not happy when neither USB nor TFTP transport for DFU defined:

cmd/dfu.c: In function ‘do_dfu’:
cmd/dfu.c:31:8: warning: unused variable ‘devstring’ [-Wunused-variable]

  char *devstring = argv[3];
        ^~~~~~~~~
cmd/dfu.c:30:8: warning: unused variable ‘interface’ [-Wunused-variable]
    char *interface = argv[2];
          ^~~~~~~~~
Quoted 4 lines

Surround those variables by #ifdef expression.

More serious, that comes under same circumstances, is a compilation error due to absence of macro parameter:

Any comments on this?

I don't know who is the right person to push this forward, please, feel free to Cc to the right one, or tell me to resend with proper Cc list.

Quoted 57 lines

In file included from include/image.h:45,

                 from include/common.h:35,
                 from cmd/dfu.c:13:
include/command.h:207:24: error: expected expression before ‘,’ token
 # define _CMD_HELP(x) x,
                        ^
include/command.h:286:18: note: in expansion of macro ‘_CMD_HELP’
    _cmd, _usage, _CMD_HELP(_help) _CMD_COMPLETE(_comp) }
                  ^~~~~~~~~
include/command.h:290:3: note: in expansion of macro ‘U_BOOT_CMD_MKENT_COMPLETE’
   U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \
   ^~~~~~~~~~~~~~~~~~~~~~~~~
include/command.h:332:2: note: in expansion of macro ‘U_BOOT_CMD_COMPLETE’
  U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
  ^~~~~~~~~~~~~~~~~~~
cmd/dfu.c:70:1: note: in expansion of macro ‘U_BOOT_CMD’
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 ^~~~~~~~~~
make[1]: *** [scripts/Makefile.build:279: cmd/dfu.o] Error 1
make: *** [Makefile:1518: cmd] Error 2

Put empty string unconditionally to have macro parameter present.

Fixes 0f44d33536a5 ("dfu: Fix up the Kconfig mess")
Cc Marek Vasut <[email protected]>
---
 cmd/dfu.c | 3 +++
 1 file changed, 3 insertions(+)
cmd/dfu.c +3 -0
index 4adb91c1b0..498a30b33b 100644
@@ -27,8 +27,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_DFU_OVER_USB
 	char *usb_controller = argv[1];
 #endif
+#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP)
 	char *interface = argv[2];
 	char *devstring = argv[3];
+#endif
 
 	int ret = 0;
 #ifdef CONFIG_DFU_OVER_TFTP
@@ -67,6 +69,7 @@ done:
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 	"Device Firmware Upgrade",
+	""
 #ifdef CONFIG_DFU_OVER_USB
 #ifdef CONFIG_DFU_TIMEOUT
 	"<USB_controller> <interface> <dev> [list|timeout]\n"
Signature · 1 line
2.20.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw

PATCH 1/1 dfu: Avoid declaring unused variables and absent parameters

Quoted 13 lines · Andy Shevchenko
Quoted 12 lines · Andy Shevchenko

The compiler is not happy when neither USB nor TFTP transport for DFU defined:

cmd/dfu.c: In function ‘do_dfu’:
cmd/dfu.c:31:8: warning: unused variable ‘devstring’ [-Wunused-variable]

  char *devstring = argv[3];
        ^~~~~~~~~
cmd/dfu.c:30:8: warning: unused variable ‘interface’ [-Wunused-variable]
    char *interface = argv[2];
          ^~~~~~~~~

Surround those variables by #ifdef expression.

Quoted 7 lines
Quoted 2 lines

More serious, that comes under same circumstances, is a compilation error due to absence of macro parameter:

Any comments on this?

I don't know who is the right person to push this forward, please, feel free to Cc to the right one, or tell me to resend with proper Cc list.

Lukasz?

Quoted 68 lines
Quoted 58 lines

In file included from include/image.h:45,

                 from include/common.h:35,
                 from cmd/dfu.c:13:
include/command.h:207:24: error: expected expression before ‘,’ token
 # define _CMD_HELP(x) x,
                        ^
include/command.h:286:18: note: in expansion of macro ‘_CMD_HELP’
    _cmd, _usage, _CMD_HELP(_help) _CMD_COMPLETE(_comp) }
                  ^~~~~~~~~
include/command.h:290:3: note: in expansion of macro ‘U_BOOT_CMD_MKENT_COMPLETE’
   U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \
   ^~~~~~~~~~~~~~~~~~~~~~~~~
include/command.h:332:2: note: in expansion of macro ‘U_BOOT_CMD_COMPLETE’
  U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
  ^~~~~~~~~~~~~~~~~~~
cmd/dfu.c:70:1: note: in expansion of macro ‘U_BOOT_CMD’
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 ^~~~~~~~~~
make[1]: *** [scripts/Makefile.build:279: cmd/dfu.o] Error 1
make: *** [Makefile:1518: cmd] Error 2

Put empty string unconditionally to have macro parameter present.

Fixes 0f44d33536a5 ("dfu: Fix up the Kconfig mess")
Cc Marek Vasut <[email protected]>
---
 cmd/dfu.c | 3 +++
 1 file changed, 3 insertions(+)
cmd/dfu.c +3 -0
index 4adb91c1b0..498a30b33b 100644
@@ -27,8 +27,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_DFU_OVER_USB
 	char *usb_controller = argv[1];
 #endif
+#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP)
 	char *interface = argv[2];
 	char *devstring = argv[3];
+#endif
 
 	int ret = 0;
 #ifdef CONFIG_DFU_OVER_TFTP
@@ -67,6 +69,7 @@ done:
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 	"Device Firmware Upgrade",
+	""
 #ifdef CONFIG_DFU_OVER_USB
 #ifdef CONFIG_DFU_TIMEOUT
 	"<USB_controller> <interface> <dev> [list|timeout]\n"
Signature · 1 line
2.20.1
Signature · 8 lines
With Best Regards,
Andy Shevchenko


_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190314/294716c2/attachment.sig>
#3 lore raw

PATCH 1/1 dfu: Avoid declaring unused variables and absent parameters

Hi Tom, Andy,

Quoted 15 lines · Andy Shevchenko
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines

The compiler is not happy when neither USB nor TFTP transport for DFU defined:

cmd/dfu.c: In function ‘do_dfu’:
cmd/dfu.c:31:8: warning: unused variable

‘devstring’ [-Wunused-variable] char *devstring = argv[3];
        ^~~~~~~~~
cmd/dfu.c:30:8: warning: unused variable
‘interface’ [-Wunused-variable] char *interface = argv[2];
          ^~~~~~~~~

Surround those variables by #ifdef expression.

Quoted 8 lines
Quoted 8 lines
Quoted 2 lines

More serious, that comes under same circumstances, is a compilation error due to absence of macro parameter:

Any comments on this?

I don't know who is the right person to push this forward, please, feel free to Cc to the right one, or tell me to resend with proper Cc list.

I can only recommend using patman, which shall link the dfu: in topic with my e-mail address,

Quoted 2 lines

Lukasz?

Regarding the patch,

If the travis doesn't complain, feel free to apply it.

Quoted 65 lines
Quoted 65 lines
Quoted 59 lines

In file included from include/image.h:45,

                 from include/common.h:35,
                 from cmd/dfu.c:13:
include/command.h:207:24: error: expected expression before ‘,’
token # define _CMD_HELP(x) x,
                        ^
include/command.h:286:18: note: in expansion of macro ‘_CMD_HELP’
    _cmd, _usage, _CMD_HELP(_help) _CMD_COMPLETE(_comp) }
                  ^~~~~~~~~

include/command.h:290:3: note: in expansion of macro ‘U_BOOT_CMD_MKENT_COMPLETE’ U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \ ^~~~~~~~~~~~~~~~~~~~~~~~~ include/command.h:332:2: note: in expansion of macro ‘U_BOOT_CMD_COMPLETE’ U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL) ^~~~~~~~~~~~~~~~~~~ cmd/dfu.c:70:1: note: in expansion of macro ‘U_BOOT_CMD’
U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, ^~~~~~~~~~
make[1]: *** [scripts/Makefile.build:279: cmd/dfu.o] Error 1
make: *** [Makefile:1518: cmd] Error 2

Put empty string unconditionally to have macro parameter present.

Fixes 0f44d33536a5 ("dfu: Fix up the Kconfig mess")
Cc Marek Vasut <[email protected]>
---
 cmd/dfu.c | 3 +++
 1 file changed, 3 insertions(+)
cmd/dfu.c +0 -0
index 4adb91c1b0..498a30b33b 100644
@@ -27,8 +27,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag,

int argc, char * const argv[]) #ifdef CONFIG_DFU_OVER_USB

cmd/dfu.c +3 -0
 	char *usb_controller = argv[1];
 #endif
+#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP)
 	char *interface = argv[2];
 	char *devstring = argv[3];
+#endif
 
 	int ret = 0;
 #ifdef CONFIG_DFU_OVER_TFTP
@@ -67,6 +69,7 @@ done:
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
 	"Device Firmware Upgrade",
+	""
 #ifdef CONFIG_DFU_OVER_USB
 #ifdef CONFIG_DFU_TIMEOUT
 	"<USB_controller> <interface> <dev> [list|timeout]\n"
Signature · 1 line
2.20.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Quoted 5 lines
Quoted 4 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190314/0d51e1de/attachment.sig>

#4 lore raw

PATCH 1/1 dfu: Avoid declaring unused variables and absent parameters

Quoted 10 lines · Lukasz Majewski
Quoted 7 lines · Andy Shevchenko
Quoted 6 lines

Any comments on this?

I don't know who is the right person to push this forward, please, feel free to Cc to the right one, or tell me to resend with proper Cc list.

I can only recommend using patman, which shall link the dfu: in topic with my e-mail address,

It's pity that different projects based on Kbuild infra are using different type of accessing to maintainers data base.
I have used get_maintainer.pl.

Quoted 7 lines
Quoted 1 line

Lukasz?

Regarding the patch,

If the travis doesn't complain, feel free to apply it.

Thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw

PATCH 1/1 dfu: Avoid declaring unused variables and absent parameters

On Fri, 15 Mar 2019 11:23:38 +0200
Andy Shevchenko andy.shevchenko at gmail.com wrote:
...

Quoted 6 lines
Quoted 2 lines

I can only recommend using patman, which shall link the dfu: in topic with my e-mail address,

It's pity that different projects based on Kbuild infra are using different type of accessing to maintainers data base.
I have used get_maintainer.pl.

get_maintainer.pl failed to report e-mail address since the dfu command code entry is not in the data base file. I've just sent a patch to fix it.

--
Anatolij