Changeset 858:acc83957ee4a in lemon-0.x for src/test/preflow_test.cc

Timestamp:

09/15/04 16:25:44 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1158

Message:

Handling strings with std::string
Do not segfault if srcdir env. variable is not set.

File:

• src/test/preflow_test.cc (modified) (4 diffs)

src/test/preflow_test.cc

@@ -1 +1 @@
 #include <fstream>
+#include <string>
+
 #include "test_tools.h"
 #include <hugo/smart_graph.h>
@@ -6 +8 @@
 #include <hugo/skeletons/graph.h>
 #include <hugo/skeletons/maps.h>
-
-#include <string.h>
 
 using namespace hugo;
@@ -70 +70 @@
   typedef Preflow<Graph, int> PType;
 
-  char *f_name;
+  string f_name;
+  if( getenv("srcdir") ) {
+    f_name = string(getenv("srcdir")) + "/preflow_graph.inp";
+  }
+  else {
+    f_name = "preflow_graph.inp";
+  }
   
-  f_name=new char[strlen(getenv("srcdir"))+50];
-  strcpy(f_name,getenv("srcdir"));
-  strcat(f_name,"/preflow_graph.inp");
+  std::ifstream file(f_name.c_str());
   
-  std::ifstream file(f_name);
-  
-  check(file,"Input file '" << f_name << "' not found.");
-  
-  delete [] f_name;
+  check(file, "Input file '" << f_name << "' not found.");
   
   Graph G;
@@ -181 +181 @@
         "The max flow value or the three min cut values are incorrect.");
 }
-
-
-