From 6b3201f0f1aa7e6bd59f766b29bccc2778555069 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Fri, 13 Mar 2015 13:39:18 +0000
Subject: Change ShellManager to return both stdout and the return value in a
 pair

---
 src/shell_manager.hh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/shell_manager.hh')

diff --git a/src/shell_manager.hh b/src/shell_manager.hh
index 60b9b13f..fde507b6 100644
--- a/src/shell_manager.hh
+++ b/src/shell_manager.hh
@@ -20,16 +20,10 @@ class ShellManager : public Singleton<ShellManager>
 public:
     ShellManager();
 
-    String eval(StringView cmdline, const Context& context,
-                ConstArrayView<String> params,
-                const EnvVarMap& env_vars,
-                int* exit_status = nullptr);
-
-    String pipe(StringView input,
-                StringView cmdline, const Context& context,
-                ConstArrayView<String> params,
-                const EnvVarMap& env_vars,
-                int* exit_status = nullptr);
+    std::pair<String, int> eval(StringView cmdline, const Context& context,
+                                StringView input = {},
+                                ConstArrayView<String> params = {},
+                                const EnvVarMap& env_vars = EnvVarMap{});
 
     void register_env_var(StringView regex, EnvVarRetriever retriever);
     String get_val(StringView name, const Context& context) const;
-- 
cgit v1.2.3