From: John L. <mov...@us...> - 2003-03-18 16:39:03
|
Update of /cvsroot/oprofile/oprofile/pp In directory sc8-pr-cvs1:/tmp/cvs-serv24795/pp Modified Files: derive_files.cpp Log Message: more 2.5 modules fixes Index: derive_files.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/derive_files.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- derive_files.cpp 18 Mar 2003 15:20:44 -0000 1.9 +++ derive_files.cpp 18 Mar 2003 16:38:58 -0000 1.10 @@ -191,10 +191,9 @@ } if (result.size() > 1) { - cerr << "the image name for samples files : " - << samples_filename << " is ambiguous\n" - << "so this file file will be ignored" << endl; - return string(); + cerr << "The image name " << samples_filename + << " matches more than one filename." << endl; + cerr << "I have used " << result[0] << endl; } return result[0]; @@ -211,12 +210,12 @@ if (errno == EACCES) { static bool first_warn = true; if (first_warn) { - cerr << "you have not read access to some binary image" - << ", all\nof this file(s) will be ignored in" - << " statistics\n"; + cerr << "You do not have read access to some binary images" + << ", all\nof these files will be ignored in" + << " the statistics\n"; first_warn = false; } - cerr << "access denied for : " << image_name << endl; + cerr << "Access denied for : " << image_name << endl; return string(); } @@ -233,9 +232,9 @@ } if (distance(p_it.first, p_it.second) != 1) { - cerr << "the image name for samples files : " - << samples_filename << " is ambiguous\n" - << "so this file file will be ignored" << endl; + return string(); + cerr << "The image name " << samples_filename + << " matches more than one filename, and will be ignored." << endl; return string(); } |