Cleanup invariants and throws in util t-z

Author: hannes-steffenhagen-diffblue

src/util/tempdir.cpp

@@ -26,8 +26,8 @@ Author: CM Wintersteiger
 #include <unistd.h>
 #endif
 
-#include "invariant.h"
 #include "file_util.h"
+#include "exception_utils.h"
 
 std::string get_temporary_directory(const std::string &name_template)
 {
@@ -38,22 +38,26 @@ std::string get_temporary_directory(const std::string &name_template)
     char lpPathBuffer[MAX_PATH+1];
     DWORD dwRetVal = GetTempPathA(dwBufSize, lpPathBuffer);
 
-    if(dwRetVal > dwBufSize || (dwRetVal == 0))
-      throw "GetTempPath failed"; // NOLINT(readability/throw)
+    if(dwRetVal > dwBufSize || (dwRetVal == 0)) {
+      throw system_exceptiont("Couldn't get temporary path");
+    }
 
     // GetTempFileNameA produces <path>\<pre><uuuu>.TMP
     // where <pre> = "TLO"
     // Thus, we must make the buffer 1+3+4+1+3=12 characters longer.
 
     char t[MAX_PATH];
     UINT uRetVal=GetTempFileNameA(lpPathBuffer, "TLO", 0, t);
-    if(uRetVal == 0)
-      throw "GetTempFileName failed"; // NOLINT(readability/throw)
+    if(uRetVal == 0) {
+      throw system_exceptiont("Couldn't get new temporary file name in directory"
+        + lpPathBuffer);
+    }
 
     unlink(t);
-    if(_mkdir(t)!=0)
-      throw "_mkdir failed";
-
+    if(_mkdir(t)!=0) {
+      throw system_exceptiont("Couldn't create temporary directory at "
+      + t);
+    }
     result=std::string(t);
 
   #else
@@ -69,7 +73,7 @@ std::string get_temporary_directory(const std::string &name_template)
     t.push_back('\0'); // add the zero
     const char *td = mkdtemp(t.data());
     if(!td)
-      throw "mkdtemp failed";
+      throw system_exceptiont("Failed to create temporary directory");
     result=std::string(td);
   #endif
 
@@ -101,11 +105,13 @@ temp_working_dirt::temp_working_dirt(const std::string &name_template):
 {
   old_working_directory=get_current_working_directory();
   if(chdir(path.c_str())!=0)
-    CHECK_RETURN(false);
+    throw system_exceptiont("Couldn't change directory to " + path);
 }
 
-temp_working_dirt::~temp_working_dirt()
+temp_working_dirt::~temp_working_dirt() noexcept(false)
 {
+  // FIXME throwing from destructors is generally a bad idea
+  //       but I can't think of anything else that'd be reasonable here?
   if(chdir(old_working_directory.c_str())!=0)
-    CHECK_RETURN(false);
+    throw system_exceptiont("Couldn't change directory to " + path);
 }

src/util/tempdir.h

@@ -39,7 +39,7 @@ class temp_working_dirt:public temp_dirt
   std::string old_working_directory;
 
   explicit temp_working_dirt(const std::string &name_template);
-  ~temp_working_dirt();
+  ~temp_working_dirt() noexcept(false);
 };
 
 #endif // CPROVER_UTIL_TEMPDIR_H

src/util/tempfile.cpp

@@ -25,6 +25,8 @@ Author: Daniel Kroening
 #include <cstdio>
 #include <cstring>
 
+#include "exception_utils.h"
+
 #if defined(__linux__) || \
     defined(__FreeBSD_kernel__) || \
     defined(__GNU__) || \
@@ -98,7 +100,7 @@ std::string get_temporary_file(
       lpTempPathBuffer); // buffer for path
 
   if(dwRetVal>MAX_PATH || (dwRetVal==0))
-    throw "GetTempPath failed"; // NOLINT(readability/throw)
+    throw system_exceptiont("Failed to get temporary directory");
 
   // the path returned by GetTempPath ends with a backslash
   std::string t_template=
@@ -121,7 +123,7 @@ std::string get_temporary_file(
   int fd=mkstemps(t_ptr, suffix.size());
 
   if(fd<0)
-    throw "mkstemps failed";
+    throw system_exceptiont("Failed to open temporary file");
 
   close(fd);
 

src/util/xml.cpp

@@ -11,6 +11,7 @@ Author: Daniel Kroening, [email protected]
 #include <ostream>
 
 #include "string2int.h"
+#include "exception_utils.h"
 
 void xmlt::clear()
 {
@@ -240,7 +241,7 @@ std::string xmlt::unescape(const std::string &str)
         result+=c;
       }
       else
-        throw "XML escape code not implemented"; // NOLINT(readability/throw)
+        throw deserialization_exceptiont("unknown XML escape code: " + tmp);
     }
     else
       result+=*it;