From 5ca7fb9b6744ccad16feda0d4a14132cbce6cd30 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 23 Jun 2015 10:34:21 +0200
Subject: ifstream/ostream take std::string

---
 src/cmd/base64.cpp   | 2 +-
 src/cmd/compress.cpp | 8 ++++----
 src/cmd/dsa_sign.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/cmd')

diff --git a/src/cmd/base64.cpp b/src/cmd/base64.cpp
index b0e39132f..69682ee58 100644
--- a/src/cmd/base64.cpp
+++ b/src/cmd/base64.cpp
@@ -59,7 +59,7 @@ int base64(int argc, char* argv[])
       {
       std::istream* stream;
       if(files[j] == "-") stream = &std::cin;
-      else                stream = new std::ifstream(files[j].c_str());
+      else                stream = new std::ifstream(files[j]);
 
       if(!*stream)
          {
diff --git a/src/cmd/compress.cpp b/src/cmd/compress.cpp
index d7456fc31..6c6a98720 100644
--- a/src/cmd/compress.cpp
+++ b/src/cmd/compress.cpp
@@ -42,7 +42,7 @@ int compress(int argc, char* argv[])
       }
 
    const std::string in_file = argv[1];
-   std::ifstream in(in_file.c_str());
+   std::ifstream in(in_file);
 
    if(!in.good())
       {
@@ -62,7 +62,7 @@ int compress(int argc, char* argv[])
       }
 
    const std::string out_file = in_file + "." + suffix;
-   std::ofstream out(out_file.c_str());
+   std::ofstream out(out_file);
 
    do_compress(*compress, in, out);
 
@@ -84,7 +84,7 @@ void parse_extension(const std::string& in_file,
 int uncompress(int argc, char* argv[])
    {
    const std::string in_file = argv[1];
-   std::ifstream in(in_file.c_str());
+   std::ifstream in(in_file);
 
    if(!in.good())
       {
@@ -95,7 +95,7 @@ int uncompress(int argc, char* argv[])
    std::string out_file, suffix;
    parse_extension(in_file, out_file, suffix);
 
-   std::ofstream out(out_file.c_str());
+   std::ofstream out(out_file);
 
    std::unique_ptr<Transform> decompress(make_decompressor(suffix));
 
diff --git a/src/cmd/dsa_sign.cpp b/src/cmd/dsa_sign.cpp
index baf884301..41c4cbc54 100644
--- a/src/cmd/dsa_sign.cpp
+++ b/src/cmd/dsa_sign.cpp
@@ -39,7 +39,7 @@ int dsa_sign(int argc, char* argv[])
          }
 
       std::string outfile = argv[2] + SUFFIX;
-      std::ofstream sigfile(outfile.c_str());
+      std::ofstream sigfile(outfile);
       if(!sigfile)
          {
          std::cout << "Couldn't write the signature to "
-- 
cgit v1.2.3