From c6d9e2b3d4c3f265fc8c8e634b6316d11dad0f41 Mon Sep 17 00:00:00 2001 From: Lauri Nurmi Date: Wed, 1 Oct 2014 20:33:02 +0300 Subject: [PATCH] Fix plural of "child" -- it is not "childs" but "children". --- cli/threadexecutor.cpp | 8 ++++---- cli/threadexecutor.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp index 366788823..dfd00a0e2 100644 --- a/cli/threadexecutor.cpp +++ b/cli/threadexecutor.cpp @@ -141,12 +141,12 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result) return 1; } -bool ThreadExecutor::checkLoadAverage(size_t nchilds) +bool ThreadExecutor::checkLoadAverage(size_t nchildren) { #ifdef __CYGWIN__ // getloadavg() is unsupported on Cygwin. return true; #else - if (!nchilds || !_settings._loadAverage) { + if (!nchildren || !_settings._loadAverage) { return true; } @@ -178,8 +178,8 @@ unsigned int ThreadExecutor::check() std::map::const_iterator i = _files.begin(); for (;;) { // Start a new child - size_t nchilds = rpipes.size(); - if (i != _files.end() && nchilds < _settings._jobs && checkLoadAverage(nchilds)) { + size_t nchildren = rpipes.size(); + if (i != _files.end() && nchildren < _settings._jobs && checkLoadAverage(nchildren)) { int pipes[2]; if (pipe(pipes) == -1) { std::cerr << "pipe() failed: "<< std::strerror(errno) << std::endl; diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h index a5e949018..84b14ced2 100644 --- a/cli/threadexecutor.h +++ b/cli/threadexecutor.h @@ -89,10 +89,10 @@ private: /** * @brief Check load average condition - * @param nchilds - count of currently runned childs + * @param nchildren - count of currently runned children * @return true - if new process can be started */ - bool checkLoadAverage(size_t nchilds); + bool checkLoadAverage(size_t nchildren); public: /**