instream: make InStream constructor take std::string

... to eliminate the c_str() conversions all over the code

No changes in behavior intended by this commit.

Author: kdudka

src/abstract-writer.cc

@@ -59,7 +59,7 @@ bool AbstractWriter::handleFile(
 bool AbstractWriter::handleFile(const std::string &fileName, bool silent)
 {
     try {
-        InStream str(fileName.c_str());
+        InStream str(fileName);
         return this->handleFile(str.str(), fileName, silent);
     }
     catch (const InFileException &e) {

src/csdiff.cc

@@ -153,8 +153,8 @@ int main(int argc, char *argv[])
 
     try {
         // open streams
-        InStream strOld(fnOld.c_str());
-        InStream strNew(fnNew.c_str());
+        InStream strOld(fnOld);
+        InStream strNew(fnNew);
 
         // run the core
         return diffScans(std::cout, strOld.str(), strNew.str(),

src/cshtml.cc

@@ -122,15 +122,15 @@ int main(int argc, char *argv[])
 
     try {
         // initialize parser for .err
-        InStream strInput(fnInput.c_str());
+        InStream strInput(fnInput);
         Parser pInput(strInput.str(), fnInput, silent);
 
         DefLookup baseLookup;
         TScanProps baseProps;
 
         // read old defects if given
         if (!fnBase.empty()) {
-            InStream strBase(fnBase.c_str());
+            InStream strBase(fnBase);
             Parser pBase(strBase.str(), fnBase, silent);
             Defect def;
             while (pBase.getNext(&def))

src/cslinker.cc

@@ -55,7 +55,7 @@ bool loadPropsFromIniFile(
 {
     try {
         // open the input file
-        InStream input(fName.c_str());
+        InStream input(fName);
 
         // parse .ini
         pt::ptree root;
@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
     if (!fnCwe.empty()) {
         try {
             // load CWE mapping from the given file
-            InStream strCwe(fnCwe.c_str());
+            InStream strCwe(fnCwe);
             if (!cweDec->cweMap().loadCweMap(strCwe.str(), fnCwe))
                 hasError = true;
         }
@@ -246,7 +246,7 @@ int main(int argc, char *argv[])
     if (!fnImp.empty()) {
         try {
             // load list of important defects
-            InStream strImp(fnImp.c_str());
+            InStream strImp(fnImp);
             Parser pImp(strImp.str(), fnImp);
             Defect defImp;
             while (pImp.getNext(&defImp))
@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
 
         try {
             // initialize parser for .err
-            InStream strErr(fnErr.c_str());
+            InStream strErr(fnErr);
             Parser pErr(strErr.str(), fnErr, silent);
 
             if (!i) {

src/instream.cc

@@ -19,14 +19,14 @@
 
 #include "instream.hh"
 
-InStream::InStream(const char *fName):
+InStream::InStream(const std::string &fName):
     fileName_(fName),
     str_((!fileName_.compare("-"))
                 ? std::cin
                 : fileStr_)
 {
     if (&str_ == &fileStr_)
-        fileStr_.open(fName, std::ios::in);
+        fileStr_.open(fileName_, std::ios::in);
 
     if (!fileStr_)
         throw InFileException(fileName_);

src/instream.hh

@@ -36,7 +36,7 @@ struct InFileException {
 
 class InStream {
     public:
-        InStream(const char *fileName);
+        InStream(const std::string &fileName);
         ~InStream();
 
         const std::string& fileName()   const { return fileName_;   }