From f4ce9d29411259fe687a863f4141e2c2d356a323 Mon Sep 17 00:00:00 2001
From: Evan Martin <martine@danga.com>
Date: Tue, 30 Nov 2010 10:50:21 -0800
Subject: [PATCH] more err removal

---
 build.cc           | 8 ++++----
 build.h            | 2 +-
 build_test.cc      | 4 ++--
 subprocess.cc      | 2 +-
 subprocess.h       | 2 +-
 subprocess_test.cc | 8 ++------
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/build.cc b/build.cc
index 90523ae..6541103 100644
--- a/build.cc
+++ b/build.cc
@@ -88,7 +88,7 @@ struct RealCommandRunner : public CommandRunner {
   virtual ~RealCommandRunner() {}
   virtual bool CanRunMore();
   virtual bool StartCommand(Edge* edge);
-  virtual void WaitForCommands(string* err);
+  virtual void WaitForCommands();
   virtual Edge* NextFinishedCommand();
 
   SubprocessSet subprocs_;
@@ -112,9 +112,9 @@ bool RealCommandRunner::StartCommand(Edge* edge) {
   return true;
 }
 
-void RealCommandRunner::WaitForCommands(string* err) {
+void RealCommandRunner::WaitForCommands() {
   while (subprocs_.finished_.empty()) {
-    subprocs_.DoWork(err);  // XXX handle err
+    subprocs_.DoWork();
   }
 }
 
@@ -186,7 +186,7 @@ bool Builder::Build(string* err) {
     if (Edge* edge = command_runner_->NextFinishedCommand())
       FinishEdge(edge);
     else
-      command_runner_->WaitForCommands(err);
+      command_runner_->WaitForCommands();
   }
 
   return true;
diff --git a/build.h b/build.h
index c80d460..6143922 100644
--- a/build.h
+++ b/build.h
@@ -48,7 +48,7 @@ struct CommandRunner {
   virtual ~CommandRunner() {}
   virtual bool CanRunMore() = 0;
   virtual bool StartCommand(Edge* edge) = 0;
-  virtual void WaitForCommands(string* err) = 0;
+  virtual void WaitForCommands() = 0;
   virtual Edge* NextFinishedCommand() = 0;
 };
 
diff --git a/build_test.cc b/build_test.cc
index 091c118..7c8ae92 100644
--- a/build_test.cc
+++ b/build_test.cc
@@ -165,7 +165,7 @@ struct BuildTest : public StateTestWithBuiltinRules,
   // CommandRunner impl
   virtual bool CanRunMore();
   virtual bool StartCommand(Edge* edge);
-  virtual void WaitForCommands(string* err);
+  virtual void WaitForCommands();
   virtual Edge* NextFinishedCommand();
 
   // DiskInterface
@@ -231,7 +231,7 @@ bool BuildTest::StartCommand(Edge* edge) {
   return false;
 }
 
-void BuildTest::WaitForCommands(string* err) {
+void BuildTest::WaitForCommands() {
 }
 
 Edge* BuildTest::NextFinishedCommand() {
diff --git a/subprocess.cc b/subprocess.cc
index aac63c2..70e5a65 100644
--- a/subprocess.cc
+++ b/subprocess.cc
@@ -89,7 +89,7 @@ void SubprocessSet::Add(Subprocess* subprocess) {
   running_.push_back(subprocess);
 }
 
-void SubprocessSet::DoWork(string* err) {
+void SubprocessSet::DoWork() {
   struct pollfd* fds = new pollfd[running_.size() * 2];
 
   map<int, Subprocess*> fd_to_subprocess;
diff --git a/subprocess.h b/subprocess.h
index d0d4166..22eb132 100644
--- a/subprocess.h
+++ b/subprocess.h
@@ -36,7 +36,7 @@ struct Subprocess {
 // is a queue of subprocesses as they finish.
 struct SubprocessSet {
   void Add(Subprocess* subprocess);
-  void DoWork(string* err);
+  void DoWork();
   Subprocess* NextFinished();
 
   vector<Subprocess*> running_;
diff --git a/subprocess_test.cc b/subprocess_test.cc
index 68095c5..e1f16bd 100644
--- a/subprocess_test.cc
+++ b/subprocess_test.cc
@@ -32,10 +32,8 @@ TEST(SubprocessSet, Single) {
   EXPECT_TRUE(ls->Start("ls /"));
   subprocs.Add(ls);
 
-  string err;
   while (!ls->done()) {
-    subprocs.DoWork(&err);
-    ASSERT_EQ("", err);
+    subprocs.DoWork();
   }
   ASSERT_NE("", ls->stdout_.buf_);
 
@@ -64,12 +62,10 @@ TEST(SubprocessSet, Multi) {
     ASSERT_EQ("", processes[i]->stderr_.buf_);
   }
 
-  string err;
   while (!processes[0]->done() || !processes[1]->done() ||
          !processes[2]->done()) {
     ASSERT_GT(subprocs.running_.size(), 0);
-    subprocs.DoWork(&err);
-    ASSERT_EQ("", err);
+    subprocs.DoWork();
   }
 
   ASSERT_EQ(0, subprocs.running_.size());
-- 
2.7.4