aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-24 15:24:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-24 15:24:29 +0200
commitcfe895f6620d22c046025027b5252e928279bf20 (patch)
treee94fa9a1ee8e8cbf9b5da75e2dbea1cbcd480397
parentb6e02f4224975a6425f62095bc35478e8866db77 (diff)
Remove msys instrumentation
-rw-r--r--libbutl/process.cxx7
-rw-r--r--libbutl/process.hxx10
2 files changed, 1 insertions, 16 deletions
diff --git a/libbutl/process.cxx b/libbutl/process.cxx
index 2a85cca..d78b64f 100644
--- a/libbutl/process.cxx
+++ b/libbutl/process.cxx
@@ -1280,8 +1280,6 @@ namespace butl
msys = i->second;
}
- msys_ = msys; //@@ TMP
-
for (size_t ret (0); ret != 40; ++ret)
{
if (!CreateProcess (
@@ -1344,7 +1342,6 @@ namespace butl
{
exit = process_exit ();
exit->status = es;
- exit->msys_ = msys_;
}
else
{
@@ -1381,7 +1378,6 @@ namespace butl
exit = process_exit ();
exit->status = es;
- exit->msys_ = msys_;
}
return true;
@@ -1468,8 +1464,7 @@ namespace butl
switch (status)
{
case STATUS_ACCESS_VIOLATION: return "access violation";
- case STATUS_DLL_INIT_FAILED: return "DLL initialization failed" +
- string (msys_ ? (*msys_ ? " (MSYS)" : " (not MSYS)") : " (unknown)");
+ case STATUS_DLL_INIT_FAILED: return "DLL initialization failed";
case STATUS_INTEGER_DIVIDE_BY_ZERO: return "integer divided by zero";
// VC-compiled program that calls abort() terminates with this error code
diff --git a/libbutl/process.hxx b/libbutl/process.hxx
index 11b320c..1f82af0 100644
--- a/libbutl/process.hxx
+++ b/libbutl/process.hxx
@@ -175,12 +175,6 @@ namespace butl
//
std::string
description () const;
-
- // @@ TMP
- //
-#ifdef _WIN32
- optional<bool> msys_;
-#endif
};
class LIBBUTL_EXPORT process
@@ -386,10 +380,6 @@ namespace butl
auto_fd out_fd; // Write to it to send to stdin.
auto_fd in_ofd; // Read from it to receive from stdout.
auto_fd in_efd; // Read from it to receive from stderr.
-
-#ifdef _WIN32
- optional<bool> msys_;
-#endif
};
// Higher-level process running interface that aims to make executing a