[PATCH] tracing: recordmcount.pl Combine the condition validation in update_funcs

From: Li Hong
Date: Tue Oct 27 2009 - 01:20:48 EST


Move all the condition validation into function update_funcs. Also
update_funcs shouldn't die if $ref_func is undefined for there may be
more than one valid sections in an object file.

Signed-off-by: Li Hong <lihong.hi@xxxxxxxxx>

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index d750da8..490b4cd 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -350,9 +350,7 @@ my $offset = 0; # offset of ref_func to section beginning
#
sub update_funcs
{
- return if ($#offsets < 0);
-
- defined($ref_func) || die "No function to reference";
+ return unless ($ref_func and @offsets);

# A section only had a weak function, to represent it.
# Unfortunately, a weak function may be overwritten by another
@@ -426,7 +424,7 @@ while (<IN>) {
$read_function = 0;
}
# print out any recorded offsets
- update_funcs() if (defined($ref_func));
+ update_funcs();

# reset all markers and arrays
$text_found = 0;
@@ -463,7 +461,7 @@ while (<IN>) {
}

# dump out anymore offsets that may have been found
-update_funcs() if (defined($ref_func));
+update_funcs();

# If we did not find any mcount callers, we are done (do nothing).
if (!$opened) {
--
1.6.0.4

--
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/