diff options
author | Josh Stone <jistone@redhat.com> | 2009-09-28 18:49:51 -0700 |
---|---|---|
committer | Josh Stone <jistone@redhat.com> | 2009-09-28 18:49:51 -0700 |
commit | e16dc041ec7dbcc83c64533ee4cf8759f6ae0be5 (patch) | |
tree | 2e5a018c8057e930bcdf27afcc290effb0b25593 /main.cxx | |
parent | 55e50c24c9176f1b3d15af94e145456a68e7ecf6 (diff) | |
download | systemtap-steved-e16dc041ec7dbcc83c64533ee4cf8759f6ae0be5.tar.gz systemtap-steved-e16dc041ec7dbcc83c64533ee4cf8759f6ae0be5.tar.xz systemtap-steved-e16dc041ec7dbcc83c64533ee4cf8759f6ae0be5.zip |
Simplify copy_file calls
Every single copy_file call we had was converting strings to char*,
printing the same error message, and optionally printing the same
verbose string. Let's canonicalize that.
* util.cxx (copy_file): Take string filenames, add a verbose flag, and
consolidate the message printing.
* cache.cxx (add_to_cache): Pass strings and remove message printing.
(get_from_cache): Ditto.
* main.cxx (main): Ditto.
* tapsets.cxx (tracepoint_builder::get_tracequery_module): Ditto.
(dwarf_cast_expanding_visitor::filter_special_modules): Ditto.
Diffstat (limited to 'main.cxx')
-rw-r--r-- | main.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1212,19 +1212,13 @@ main (int argc, char * const argv []) // inaccessible for some reason. if (! s.use_cache && s.last_pass == 4) save_module = true; - + // Copy module to the current directory. if (save_module && !pending_interrupts) { string module_src_path = s.tmpdir + "/" + s.module_name + ".ko"; string module_dest_path = s.module_name + ".ko"; - - if (s.verbose > 1) - clog << "Copying " << module_src_path << " to " - << module_dest_path << endl; - if (copy_file(module_src_path.c_str(), module_dest_path.c_str()) != 0) - cerr << "Copy failed (\"" << module_src_path << "\" to \"" - << module_dest_path << "\"): " << strerror(errno) << endl; + copy_file(module_src_path, module_dest_path, s.verbose > 1); } } |