openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

build-aux:check-spacing: Add wrapper function of KillComments 

This patch adds KillComments to simplifies check-spacing.

Signed-off-by: Shi Lei <shi_lei@massclouds.com>
This commit is contained in:
Shi Lei 2018-09-19 16:38:16 +08:00 committed by Michal Privoznik
parent e995904c56
commit c3875129d9
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
build-aux/check-spacing.pl
View File

@ -62,8 +62,41 @@ sub CheckFunctionBody {
return $ret; return $ret;
} }
#
# KillComments:
# $_[0]: $data(inout)
# $_[1]: $incomment(inout)
#
# Remove all content of comments
# (Also, the @incomment could be declared with *state* and move it in.)
#
sub KillComments {
my ($data, $incomment) = @_;
# Kill contents of multi-line comments
# and detect end of multi-line comments
if ($$incomment) {
if ($$data =~ m,\*/,) {
$$incomment = 0;
$$data =~ s,^.*\*/,*/,;
} else {
$$data = "";
}
}
# Kill single line comments, and detect
# start of multi-line comments
if ($$data =~ m,/\*.*\*/,) {
$$data =~ s,/\*.*\*/,/* */,;
} elsif ($$data =~ m,/\*,) {
$$incomment = 1;
$$data =~ s,/\*.*,/*,;
}
return;
}
my $ret = 0; my $ret = 0;
my $incomment = 0;
foreach my $file (@ARGV) { foreach my $file (@ARGV) {
# Per-file variables for multiline Curly Bracket (cb_) check # Per-file variables for multiline Curly Bracket (cb_) check
@ -71,6 +104,7 @@ foreach my $file (@ARGV) {
my $cb_code = ""; my $cb_code = "";
my $cb_scolon = 0; my $cb_scolon = 0;
my $fn_linenum = 0; my $fn_linenum = 0;
my $incomment = 0;
open FILE, $file; open FILE, $file;
@ -93,25 +127,7 @@ foreach my $file (@ARGV) {
$ret = 1 if CheckFunctionBody(\$data, \$location, \$fn_linenum); $ret = 1 if CheckFunctionBody(\$data, \$location, \$fn_linenum);
# Kill contents of multi-line comments KillComments(\$data, \$incomment);
# and detect end of multi-line comments
if ($incomment) {
if ($data =~ m,\*/,) {
$incomment = 0;
$data =~ s,^.*\*/,*/,;
} else {
$data = "";
}
}
# Kill single line comments, and detect
# start of multi-line comments
if ($data =~ m,/\*.*\*/,) {
$data =~ s,/\*.*\*/,/* */,;
} elsif ($data =~ m,/\*,) {
$incomment = 1;
$data =~ s,/\*.*,/*,;
}
# We need to match things like # We need to match things like
# #