2016-12-18 12:36:16

by Cheah Kok Cheong

Subject: [PATCH] scripts: checkincludes: add exit message for no duplicates found

If no duplicates found, inform user.

Signed-off-by: Cheah Kok Cheong <[email protected]>
---
scripts/checkincludes.pl | 13 +++++++++++++
1 file changed, 13 insertions(+)

diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 97b2c61..2bf234c 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -37,6 +37,13 @@ if ($#ARGV >= 1) {
}
}

+my $dup_counter = 0;
+
+sub nodup_count {
+ ++$dup_counter;
+ return;
+}
+
foreach my $file (@ARGV) {
open(my $f, '<', $file)
or die "Cannot open $file: $!.\n";
@@ -57,6 +64,7 @@ foreach my $file (@ARGV) {
foreach my $filename (keys %includedfiles) {
if ($includedfiles{$filename} > 1) {
print "$file: $filename is included more than once.\n";
+ nodup_count();
}
}
next;
@@ -73,6 +81,7 @@ foreach my $file (@ARGV) {
if ($includedfiles{$filename} > 1) {
$includedfiles{$filename}--;
$dups++;
+ nodup_count();
} else {
print {$f} $_;
}
@@ -87,3 +96,7 @@ foreach my $file (@ARGV) {
}
close($f);
}
+
+if ($dup_counter == 0) {
+ print "No duplicate includes found.\n";
+}
--
2.7.4

2016-12-19 10:47:50

by Michal Marek

Subject: Re: [PATCH] scripts: checkincludes: add exit message for no duplicates found

On 2016-12-18 13:35, Cheah Kok Cheong wrote:
> If no duplicates found, inform user.
>
> Signed-off-by: Cheah Kok Cheong <[email protected]>
> ---
> scripts/checkincludes.pl | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
> index 97b2c61..2bf234c 100755
> --- a/scripts/checkincludes.pl
> +++ b/scripts/checkincludes.pl
> @@ -37,6 +37,13 @@ if ($#ARGV >= 1) {
> }
> }
>
> +my $dup_counter = 0;
> +
> +sub nodup_count {
> + ++$dup_counter;
> + return;
> +}

I don't think it's necessary to have a function only to increment a
variable.

Michal

2016-12-20 09:10:37

by Cheah Kok Cheong

Subject: Re: [PATCH] scripts: checkincludes: add exit message for no duplicates found

On Mon, Dec 19, 2016 at 11:47:47AM +0100, Michal Marek wrote:
> On 2016-12-18 13:35, Cheah Kok Cheong wrote:
> > If no duplicates found, inform user.
> >
> > Signed-off-by: Cheah Kok Cheong <[email protected]>
> > ---
> > scripts/checkincludes.pl | 13 +++++++++++++
> > 1 file changed, 13 insertions(+)
> >
> > diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
> > index 97b2c61..2bf234c 100755
> > --- a/scripts/checkincludes.pl
> > +++ b/scripts/checkincludes.pl
> > @@ -37,6 +37,13 @@ if ($#ARGV >= 1) {
> > }
> > }
> >
> > +my $dup_counter = 0;
> > +
> > +sub nodup_count {
> > + ++$dup_counter;
> > + return;
> > +}
>
> I don't think it's necessary to have a function only to increment a
> variable.
>
> Michal

Sorry do you mean the subroutine is not required and the "variable" is
best placed inside directly?

Thanks.
CheahKC