From 5021c97e31ef8bb7cf40471e3fa98b451097451b Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Fri, 19 Feb 2016 19:11:33 +0100 Subject: Rename some functions to match overall naming scheme --- src/tracking/change_tracker.cc | 8 ++++---- src/utility/io.cc | 2 +- src/utility/io.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tracking/change_tracker.cc b/src/tracking/change_tracker.cc index 9eab5a2..bc8465e 100644 --- a/src/tracking/change_tracker.cc +++ b/src/tracking/change_tracker.cc @@ -10,7 +10,7 @@ constexpr unsigned int EMPLACE_SUCCESS = 1; constexpr unsigned int FILE_PATH = 0; constexpr unsigned int FILE_CONTENT = 1; -boost::process::context getDefaultContext() { +boost::process::context get_default_context() { boost::process::context context; context.environment = boost::process::self::get_environment(); @@ -29,7 +29,7 @@ boost::process::context getDefaultContext() { // // diff -u --label $file_path - $file_path // -std::string getDiffCommand( +std::string get_diff_command( const std::string& diff_cmd, const std::string& file_path) { return diff_cmd + " --label " + file_path + " - " + file_path; } @@ -72,8 +72,8 @@ ChangeTracker::~ChangeTracker() { if ( boost::filesystem::exists(tracked_path) ) { boost::process::child diffProcess{ boost::process::launch_shell( - getDiffCommand(this->diff_cmd_, tracked_path), - getDefaultContext() + get_diff_command(this->diff_cmd_, tracked_path), + get_default_context() ) }; diff --git a/src/utility/io.cc b/src/utility/io.cc index 3f54c6f..ae895c4 100644 --- a/src/utility/io.cc +++ b/src/utility/io.cc @@ -19,7 +19,7 @@ FileDescriptorGuard::~FileDescriptorGuard() { close(this->fd_); } -FileDescriptorGuard::operator int() { +FileDescriptorGuard::operator int() const { return this->fd_; } diff --git a/src/utility/io.h b/src/utility/io.h index 1015ddb..363c458 100644 --- a/src/utility/io.h +++ b/src/utility/io.h @@ -10,7 +10,7 @@ class FileDescriptorGuard { FileDescriptorGuard(const std::string& path); ~FileDescriptorGuard(); - operator int(); + operator int() const; private: int fd_; -- cgit v1.2.3