2010-08-15 04:13:24

by Hiromu Yakura

[permalink] [raw]
Subject: [PATCH] kconfig: Fix variable name typo in streamline_config.pl.

When I added "use strict;" to streamline_config.pl, I saw following
warnings.

> Global symbol "%prompt" requires explicit package name at
scripts/kconfig/streamline_config.pl line 183.
> Global symbol "%prompt" requires explicit package name at
scripts/kconfig/streamline_config.pl line 368.

Let's fix it.
(Note: prompts[] is defined at line 123 but never used. This seems
typo.)

Cc: Steven Rostedt <[email protected]>
Cc: Toralf Foerster <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Cc: YOSHIFUJI Hideaki <[email protected]>

Signed-off-by: Hiromu Yakura <[email protected]>
---
scripts/kconfig/streamline_config.pl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl
b/scripts/kconfig/streamline_config.pl
index c70a27d..d74363f 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -178,7 +178,7 @@ sub read_kconfig {
# configs without prompts must be selected
} elsif ($state ne "NONE" && /^\s*tristate\s\S/) {
# note if the config has a prompt
- $prompt{$config} = 1;
+ $prompts{$config} = 1;

# Check for if statements
} elsif (/^if\s+(.*\S)\s*$/) {
@@ -363,7 +363,7 @@ while ($repeat) {
parse_config_dep_select $depends{$config};
}

- if (defined($prompt{$config}) || !defined($selects{$config})) {
+ if (defined($prompts{$config}) || !defined($selects{$config})) {
next;
}

--
1.7.0.4



2010-08-17 05:39:06

by Cong Wang

[permalink] [raw]
Subject: Re: [PATCH] kconfig: Fix variable name typo in streamline_config.pl.

On Sun, Aug 15, 2010 at 01:13:17PM +0900, hiromu yagura wrote:
>When I added "use strict;" to streamline_config.pl, I saw following
>warnings.
>
>> Global symbol "%prompt" requires explicit package name at
>scripts/kconfig/streamline_config.pl line 183.
>> Global symbol "%prompt" requires explicit package name at
>scripts/kconfig/streamline_config.pl line 368.
>
>Let's fix it.
>(Note: prompts[] is defined at line 123 but never used. This seems
>typo.)
>
>Cc: Steven Rostedt <[email protected]>
>Cc: Toralf Foerster <[email protected]>
>Cc: KAMEZAWA Hiroyuki <[email protected]>
>Cc: YOSHIFUJI Hideaki <[email protected]>
>
>Signed-off-by: Hiromu Yakura <[email protected]>


Acked-by: WANG Cong <[email protected]>

BTW, I think we should add "use strict;" too.

>---
> scripts/kconfig/streamline_config.pl | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/scripts/kconfig/streamline_config.pl
>b/scripts/kconfig/streamline_config.pl
>index c70a27d..d74363f 100644
>--- a/scripts/kconfig/streamline_config.pl
>+++ b/scripts/kconfig/streamline_config.pl
>@@ -178,7 +178,7 @@ sub read_kconfig {
> # configs without prompts must be selected
> } elsif ($state ne "NONE" && /^\s*tristate\s\S/) {
> # note if the config has a prompt
>- $prompt{$config} = 1;
>+ $prompts{$config} = 1;
>
> # Check for if statements
> } elsif (/^if\s+(.*\S)\s*$/) {
>@@ -363,7 +363,7 @@ while ($repeat) {
> parse_config_dep_select $depends{$config};
> }
>
>- if (defined($prompt{$config}) || !defined($selects{$config})) {
>+ if (defined($prompts{$config}) || !defined($selects{$config})) {
> next;
> }
>
>--
>1.7.0.4
>
>
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to [email protected]
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/

2010-08-17 10:49:25

by Hiromu Yakura

[permalink] [raw]
Subject: Re: [PATCH] kconfig: Fix variable name typo in streamline_config.pl.

On Fri, Aug 17, 2010 at 01:43PM +0800, Américo Wang wrote:
> Acked-by: WANG Cong <[email protected]>
>
> BTW, I think we should add "use strict;" too.

Then I added "use strict;" to streamline_config.pl, I saw another
warings.

> Global symbol "$dir" requires explicit package name at
scripts/kconfig/streamline_config.pl line 286.
> Global symbol "$dir" requires explicit package name at
scripts/kconfig/streamline_config.pl line 287.
> Global symbol "$dir" requires explicit package name at
scripts/kconfig/streamline_config.pl line 288.

Then I added "my $dir;" to line 285.

Cc: Américo Wang <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Toralf Foerster <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Cc: YOSHIFUJI Hideaki <[email protected]>

Signed-off-by: Hiromu Yakura <[email protected]>
---
scripts/kconfig/streamline_config.pl | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl
b/scripts/kconfig/streamline_config.pl
index d74363f..9ca361a 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -42,6 +42,8 @@
# mv config_strip .config
# make oldconfig
#
+use strict;
+
my $config = ".config";

my $uname = `uname -r`;
@@ -280,6 +282,7 @@ if (defined($lsmod_file)) {

# see what modules are loaded on this system
my $lsmod;
+ my $dir;

foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) {
if ( -x "$dir/lsmod" ) {
--
1.7.0.4

2010-08-17 12:58:48

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH] kconfig: Fix variable name typo in streamline_config.pl.

On Tue, 2010-08-17 at 19:49 +0900, hiromu wrote:
> On Fri, Aug 17, 2010 at 01:43PM +0800, Am?rico Wang wrote:
> > Acked-by: WANG Cong <[email protected]>
> >
> > BTW, I think we should add "use strict;" too.
>
> Then I added "use strict;" to streamline_config.pl, I saw another
> warings.
>
> > Global symbol "$dir" requires explicit package name at
> scripts/kconfig/streamline_config.pl line 286.
> > Global symbol "$dir" requires explicit package name at
> scripts/kconfig/streamline_config.pl line 287.
> > Global symbol "$dir" requires explicit package name at
> scripts/kconfig/streamline_config.pl line 288.
>
> Then I added "my $dir;" to line 285.

Thanks! I'll pull this in today.

-- Steve

>
> Cc: Am?rico Wang <[email protected]>
> Cc: Steven Rostedt <[email protected]>
> Cc: Toralf Foerster <[email protected]>
> Cc: KAMEZAWA Hiroyuki <[email protected]>
> Cc: YOSHIFUJI Hideaki <[email protected]>
>
> Signed-off-by: Hiromu Yakura <[email protected]>
> ---
> scripts/kconfig/streamline_config.pl | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/kconfig/streamline_config.pl
> b/scripts/kconfig/streamline_config.pl
> index d74363f..9ca361a 100644
> --- a/scripts/kconfig/streamline_config.pl
> +++ b/scripts/kconfig/streamline_config.pl
> @@ -42,6 +42,8 @@
> # mv config_strip .config
> # make oldconfig
> #
> +use strict;
> +
> my $config = ".config";
>
> my $uname = `uname -r`;
> @@ -280,6 +282,7 @@ if (defined($lsmod_file)) {
>
> # see what modules are loaded on this system
> my $lsmod;
> + my $dir;
>
> foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) {
> if ( -x "$dir/lsmod" ) {