Re: [PATCH 5/5] scripts/checkincludes.pl: Replace tabs with spaces

[Cruz Julian Bishop]

My bad, misread the documentation files.

I'll resubmit without this

On Tue, 2012-09-04 at 08:20 +1000, Cruz Julian Bishop wrote:
> This is required by the CodingStyle kernel documentation file
> 
> Signed-off-by: Cruz Julian Bishop <cruzjbishop@xxxxxxxxx>
> ---
>  scripts/checkincludes.pl | 122 +++++++++++++++++++++++------------------------
>  1 file changed, 61 insertions(+), 61 deletions(-)
> 
> diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
> index bff7316..7e3df9e 100755
> --- a/scripts/checkincludes.pl
> +++ b/scripts/checkincludes.pl
> @@ -14,7 +14,7 @@
>  use strict;
>  
>  sub usage {
> -	print <<EOM;
> +        print <<EOM;
>  Usage: checkincludes.pl [OPTIONS]... FILE...
>  By default, we just warn of duplicates.
>  
> @@ -23,84 +23,84 @@ Options:
>    -q                Do not show messages for files that do not
>                      have duplicated includes
>  EOM
> -	exit 1;
> +        exit 1;
>  }
>  
>  my $remove = 0;
>  my $quiet = 0;
>  
>  if ($#ARGV < 0) {
> -	usage();
> +        usage();
>  }
>  
>  my $argc = 0;
>  
>  foreach my $arg (@ARGV) {
> -	if ($arg eq "-r") {
> -		$remove = 1;
> -	} elsif($arg eq "-q") {
> -		$quiet = 1;
> -	} else {
> -		open(my $f, '<', $arg)
> -		    or die "Cannot open $arg: $!.\n";
> -		    
> -		$argc++;
> +        if ($arg eq "-r") {
> +                $remove = 1;
> +        } elsif($arg eq "-q") {
> +                $quiet = 1;
> +        } else {
> +                open(my $f, '<', $arg)
> +                        or die "Cannot open $arg: $!.\n";
> +                    
> +                $argc++;
>  
> -		my %includedfiles = ();
> -		my @file_lines = ();
> +                my %includedfiles = ();
> +                my @file_lines = ();
>  
> -		while (<$f>) {
> -			if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
> -				++$includedfiles{$1};
> -			}
> -			push(@file_lines, $_);
> -		}
> +                while (<$f>) {
> +                        if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
> +                                ++$includedfiles{$1};
> +                        }
> +                        push(@file_lines, $_);
> +                }
>  
> -		close($f);
> +                close($f);
>  
> -		if (!$remove) {
> -			my $detected = 0;
> -			foreach my $filename (keys %includedfiles) {
> -				if ($includedfiles{$filename} > 1) {
> -					$detected++;
> -					print "$arg: $filename is included more than once.\n";
> -				}
> -			}
> -			if (!$detected && !$quiet) {
> -				print "$arg: No duplicated includes detected.\n";
> -			}
> -			next;
> -		}
> +                if (!$remove) {
> +                        my $detected = 0;
> +                        foreach my $filename (keys %includedfiles) {
> +                                if ($includedfiles{$filename} > 1) {
> +                                        $detected++;
> +                                print "$arg: $filename is included more than once.\n";
> +                                }
> +                        }
> +                        if (!$detected && !$quiet) {
> +                                print "$arg: No duplicated includes detected.\n";
> +                        }
> +                        next;
> +                }
>  
> -		open($f, '>', $arg)
> -			or die("Cannot write to $arg: $!");
> +                open($f, '>', $arg)
> +                        or die("Cannot write to $arg: $!");
>  
> -		my $dups = 0;
> -		foreach(@file_lines) {
> -			if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
> -				foreach my $filename (keys %includedfiles) {
> -					if ($1 eq $filename) {
> -						if ($includedfiles{$filename} > 1) {
> -							$includedfiles{$filename}--;
> -							$dups++;
> -						} else {
> -							print {$f} $_;
> -						}
> -					}
> -				}
> -			} else {
> -				print {$f} $_;
> -			}
> -		}
> -		if ($dups > 0) {
> -			print "$arg: removed $dups duplicate includes \n";
> -		} elsif (!$quiet) {
> -			print "$arg: no duplicated includes to remove \n";
> -		}
> -		close($f);
> -	}
> +                my $dups = 0;
> +                foreach(@file_lines) {
> +                        if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
> +                                foreach my $filename (keys %includedfiles) {
> +                                        if ($1 eq $filename) {
> +                                                if ($includedfiles{$filename} > 1) {
> +                                                        $includedfiles{$filename}--;
> +                                                        $dups++;
> +                                                } else {
> +                                                        print {$f} $_;
> +                                                }
> +                                        }
> +                                }
> +                        } else {
> +                                print {$f} $_;
> +                        }
> +                }
> +                if ($dups > 0) {
> +                        print "$arg: removed $dups duplicate includes \n";
> +                } elsif (!$quiet) {
> +                        print "$arg: no duplicated includes to remove \n";
> +                }
> +                close($f);
> +        }
>  }
>  
>  if ($argc == 0) {
> -	usage();
> +        usage();
>  }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/