[oprof-cvs] CVS: oprofile/pp counter_util.cpp,1.2,1.3 op_to_source.cpp,1.22,1.23 samples_file.cpp,1.13,1.14

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/pp
In directory usw-pr-cvs1:/tmp/cvs-serv28980/pp

Modified Files:
	counter_util.cpp op_to_source.cpp samples_file.cpp 
Log Message:
A couple of bug fixes



Index: counter_util.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/counter_util.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- counter_util.cpp	6 Jun 2002 16:18:27 -0000	1.2
+++ counter_util.cpp	16 Jun 2002 19:51:01 -0000	1.3
@@ -63,8 +63,10 @@
 	if (sort_by_counter == -1) {
 		// get the first counter selected and use it as sort order
 		for (size_t i = 0 ; i < OP_MAX_COUNTERS ; ++i) {
-			if ((counter_mask & (1 << i)) != 0)
+			if ((counter_mask & (1 << i)) != 0) {
 				sort_by_counter = i;
+				break;
+			}
 		}
 	}
 

Index: op_to_source.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_to_source.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- op_to_source.cpp	16 Jun 2002 17:32:15 -0000	1.22
+++ op_to_source.cpp	16 Jun 2002 19:51:01 -0000	1.23
@@ -835,7 +835,8 @@
 			      options::no_output_filter,
 			      options::assembly, options::source_with_assembly, -1);
 
-		if (!output.treat_input(options::image_file, options::sample_file))
+		if (!output.treat_input(options::image_file,
+			relative_to_absolute_path(options::sample_file, OP_SAMPLES_DIR)))
 			return EXIT_FAILURE;
 	}
 

Index: samples_file.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/samples_file.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- samples_file.cpp	16 Jun 2002 17:32:15 -0000	1.13
+++ samples_file.cpp	16 Jun 2002 19:51:01 -0000	1.14
@@ -63,7 +63,8 @@
 	}
 
 	if (first_file == OP_MAX_COUNTERS) {
-		fprintf(stderr, "Can not open any samples files for %s last error %s\n", sample_filename.c_str(), strerror(errno));
+		cerr << "Can not open any samples files for " << sample_filename
+			<< ". Last error " << strerror(errno) << endl;
 		exit(EXIT_FAILURE);
 	}