From 9e3a88c41d4674f4e1c6046bf21898583bb8da02 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sat, 14 Jul 2018 19:22:50 -0400
Subject: [PATCH] Inability to write a file is typically user, not internal
 error.

---
 src/V3Ast.cpp         | 4 ++--
 src/V3Cdc.cpp         | 6 +++---
 src/V3File.cpp        | 8 ++++----
 src/V3Graph.cpp       | 4 ++--
 src/V3Hashed.cpp      | 4 ++--
 src/V3LinkDot.cpp     | 4 ++--
 src/V3Order.cpp       | 8 ++++----
 src/V3StatsReport.cpp | 4 ++--
 src/V3SymTable.h      | 4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index d23eba353..3e33a34c2 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -1048,8 +1048,8 @@ void AstNode::dumpTreeFile(const string& filename, bool append, bool doDump) {
     if (doDump) {
 	{   // Write log & close
 	    UINFO(2,"Dumping "<<filename<<endl);
-	    const vl_unique_ptr<ofstream> logsp (V3File::new_ofstream(filename, append));
-	    if (logsp->fail()) v3fatalSrc("Can't write "<<filename);
+            const vl_unique_ptr<std::ofstream> logsp (V3File::new_ofstream(filename, append));
+            if (logsp->fail()) v3fatal("Can't write "<<filename);
 	    *logsp<<"Verilator Tree Dump (format 0x3900) from <e"<<dec<<editCountLast()<<">";
 	    *logsp<<" to <e"<<dec<<editCountGbl()<<">"<<endl;
 	    if (editCountGbl()==editCountLast()
diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp
index d98167f8d..e64be9396 100644
--- a/src/V3Cdc.cpp
+++ b/src/V3Cdc.cpp
@@ -496,8 +496,8 @@ private:
 	}
 
 	string filename = v3Global.opt.makeDir()+"/"+v3Global.opt.prefix()+"__cdc_edges.txt";
-	const vl_unique_ptr<ofstream> ofp (V3File::new_ofstream(filename));
-	if (ofp->fail()) v3fatalSrc("Can't write "<<filename);
+        const vl_unique_ptr<std::ofstream> ofp (V3File::new_ofstream(filename));
+        if (ofp->fail()) v3fatal("Can't write "<<filename);
 	*ofp<<"Edge Report for "<<v3Global.opt.prefix()<<endl;
 
 	deque<string> report;  // Sort output by name
@@ -739,7 +739,7 @@ public:
 	// Make report of all signal names and what clock edges they have
 	string filename = v3Global.opt.makeDir()+"/"+v3Global.opt.prefix()+"__cdc.txt";
 	m_ofp = V3File::new_ofstream(filename);
-	if (m_ofp->fail()) v3fatalSrc("Can't write "<<filename);
+        if (m_ofp->fail()) v3fatal("Can't write "<<filename);
 	m_ofFilename = filename;
 	*m_ofp<<"CDC Report for "<<v3Global.opt.prefix()<<endl;
 	*m_ofp<<"Each dump below traces logic from inputs/source flops to destination flop(s).\n";
diff --git a/src/V3File.cpp b/src/V3File.cpp
index 17a104306..161bb2d86 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -134,8 +134,8 @@ V3FileDependImp  dependImp;	// Depend implementation class
 // V3FileDependImp
 
 inline void V3FileDependImp::writeDepend(const string& filename) {
-    const vl_unique_ptr<ofstream> ofp (V3File::new_ofstream(filename));
-    if (ofp->fail()) v3fatalSrc("Can't write "<<filename);
+    const vl_unique_ptr<std::ofstream> ofp (V3File::new_ofstream(filename));
+    if (ofp->fail()) v3fatal("Can't write "<<filename);
 
     for (set<DependFile>::iterator iter=m_filenameList.begin();
 	 iter!=m_filenameList.end(); ++iter) {
@@ -170,8 +170,8 @@ inline void V3FileDependImp::writeDepend(const string& filename) {
 }
 
 inline void V3FileDependImp::writeTimes(const string& filename, const string& cmdlineIn) {
-    const vl_unique_ptr<ofstream> ofp (V3File::new_ofstream(filename));
-    if (ofp->fail()) v3fatalSrc("Can't write "<<filename);
+    const vl_unique_ptr<std::ofstream> ofp (V3File::new_ofstream(filename));
+    if (ofp->fail()) v3fatal("Can't write "<<filename);
 
     string cmdline = stripQuotes(cmdlineIn);
     *ofp<<"# DESCR"<<"IPTION: Verilator output: Timestamp data for --skip-identical.  Delete at will."<<endl;
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index bfcfd463b..340b0bee7 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -288,8 +288,8 @@ void V3Graph::dumpDotFilePrefixedAlways(const string& nameComment, bool colorAsS
 void V3Graph::dumpDotFile(const string& filename, bool colorAsSubgraph) const {
     // This generates a file used by graphviz, http://www.graphviz.org
     // "hardcoded" parameters:
-    const vl_unique_ptr<ofstream> logp (V3File::new_ofstream(filename));
-    if (logp->fail()) v3fatalSrc("Can't write "<<filename);
+    const vl_unique_ptr<std::ofstream> logp (V3File::new_ofstream(filename));
+    if (logp->fail()) v3fatal("Can't write "<<filename);
 
     // Header
     *logp<<"digraph v3graph {\n";
diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp
index 0348313d3..f1b3dfa98 100644
--- a/src/V3Hashed.cpp
+++ b/src/V3Hashed.cpp
@@ -141,8 +141,8 @@ void V3Hashed::dumpFilePrefixed(const string& nameComment, bool tree) {
 }
 
 void V3Hashed::dumpFile(const string& filename, bool tree) {
-    const vl_unique_ptr<ofstream> logp (V3File::new_ofstream(filename));
-    if (logp->fail()) v3fatalSrc("Can't write "<<filename);
+    const vl_unique_ptr<std::ofstream> logp (V3File::new_ofstream(filename));
+    if (logp->fail()) v3fatal("Can't write "<<filename);
 
     map<int,int> dist;
 
diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
index f2e62b132..b65859613 100644
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@@ -136,8 +136,8 @@ public:
     void dump(const string& nameComment="linkdot", bool force=false) {
 	if (debug()>=6 || force) {
 	    string filename = v3Global.debugFilename(nameComment)+".txt";
-	    const vl_unique_ptr<ofstream> logp (V3File::new_ofstream(filename));
-	    if (logp->fail()) v3fatalSrc("Can't write "<<filename);
+            const vl_unique_ptr<std::ofstream> logp (V3File::new_ofstream(filename));
+            if (logp->fail()) v3fatal("Can't write "<<filename);
 	    ostream& os = *logp;
 	    m_syms.dump(os);
 	    bool first = true;
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index 723dd15dd..80673b99c 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -1262,8 +1262,8 @@ void OrderVisitor::processDomainsIterate(OrderEitherVertex* vertexp) {
 void OrderVisitor::processEdgeReport() {
     // Make report of all signal names and what clock edges they have
     string filename = v3Global.debugFilename("order_edges.txt");
-    const vl_unique_ptr<ofstream> logp (V3File::new_ofstream(filename));
-    if (logp->fail()) v3fatalSrc("Can't write "<<filename);
+    const vl_unique_ptr<std::ofstream> logp (V3File::new_ofstream(filename));
+    if (logp->fail()) v3fatal("Can't write "<<filename);
     //Testing emitter: V3EmitV::verilogForTree(v3Global.rootp(), *logp);
 
     deque<string> report;
@@ -1636,8 +1636,8 @@ void OrderVisitor::process() {
     m_graph.dumpDotFilePrefixed("orderg_done");
     if (0 && debug()) {
 	string dfilename = v3Global.opt.makeDir()+"/"+v3Global.opt.prefix()+"_INT_order";
-	const vl_unique_ptr<ofstream> logp (V3File::new_ofstream(dfilename));
-	if (logp->fail()) v3fatalSrc("Can't write "<<dfilename);
+        const vl_unique_ptr<std::ofstream> logp (V3File::new_ofstream(dfilename));
+        if (logp->fail()) v3fatal("Can't write "<<dfilename);
 	m_graph.dump(*logp);
     }
 }
diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp
index 6208d2ea7..0cbf46505 100644
--- a/src/V3StatsReport.cpp
+++ b/src/V3StatsReport.cpp
@@ -243,8 +243,8 @@ void V3Stats::statsReport() {
 
     // Open stats file
     string filename = v3Global.opt.makeDir()+"/"+v3Global.opt.prefix()+"__stats.txt";
-    ofstream* ofp (V3File::new_ofstream(filename));
-    if (ofp->fail()) v3fatalSrc("Can't write "<<filename);
+    std::ofstream* ofp (V3File::new_ofstream(filename));
+    if (ofp->fail()) v3fatal("Can't write "<<filename);
 
     StatsReport reporter (ofp);
 
diff --git a/src/V3SymTable.h b/src/V3SymTable.h
index 479f96de3..f2237a9e3 100644
--- a/src/V3SymTable.h
+++ b/src/V3SymTable.h
@@ -283,8 +283,8 @@ public:
 	if (v3Global.opt.dumpTree()) {
 	    string filename = v3Global.debugFilename(nameComment)+".txt";
 	    UINFO(2,"Dumping "<<filename<<endl);
-	    const vl_unique_ptr<ofstream> logp (V3File::new_ofstream(filename));
-	    if (logp->fail()) v3fatalSrc("Can't write "<<filename);
+            const vl_unique_ptr<std::ofstream> logp (V3File::new_ofstream(filename));
+            if (logp->fail()) v3fatal("Can't write "<<filename);
 	    dump(*logp, "");
 	}
     }