[oprof-cvs] CVS: oprofile/libutil++ file_manip.cpp,1.16,1.17 op_bfd.cpp,1.14,1.15

[Philippe E. <ph...@us...>]

Update of /cvsroot/oprofile/oprofile/libutil++
In directory usw-pr-cvs1:/tmp/cvs-serv30397/libutil++

Modified Files:
	file_manip.cpp op_bfd.cpp 
Log Message:

small cleanup

regards,
Phil


Index: file_manip.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/file_manip.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- file_manip.cpp	11 Oct 2002 02:11:39 -0000	1.16
+++ file_manip.cpp	26 Oct 2002 17:36:22 -0000	1.17
@@ -225,9 +225,7 @@
 	result.erase(pos, result.length() - pos);
 
 	// "////usr" must return "/"
-	result = erase_trailing_path_separator(result);
-
-	return result;
+	return erase_trailing_path_separator(result);
 }
 
 

Index: op_bfd.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/op_bfd.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- op_bfd.cpp	24 Oct 2002 17:29:19 -0000	1.14
+++ op_bfd.cpp	26 Oct 2002 17:36:22 -0000	1.15
@@ -199,7 +199,7 @@
 		vector<string>::const_iterator it =
 			find(excluded.begin(), excluded.end(), syms[i].name());
 		if (it != excluded.end()) {
-			cout << "excluding symbol " << syms[i].name() << endl;
+			cverb << "excluding symbol " << syms[i].name() << endl;
 			syms.erase(syms.begin() + i);
 		} else {
 			++i;
@@ -213,6 +213,7 @@
 				find(included.begin(), included.end(),
 				     syms[i].name());
 			if (it == included.end()) {
+				cverb << "excluding symbol " << syms[i].name() << endl;
 				syms.erase(syms.begin() + i);
 			} else {
 				++i;
@@ -222,10 +223,7 @@
 
 	cverb << "number of symbols now " << dec << syms.size() << endl;
 
-	if (syms.empty())
-		return false;
-
-	return true;
+	return !syms.empty();
 }