X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FDaemon%2FDaemon.cc;h=e2f0fec1332680cf84897cc45a4ba4d42cb7b352;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=e2969a9e563049aa3f3402e35efa97dc43c2dc51;hpb=c40594da2a8fc3d681ed3c2e74ff632f1df2b31c;p=senf.git

diff --git a/senf/Utils/Daemon/Daemon.cc b/senf/Utils/Daemon/Daemon.cc
index e2969a9..e2f0fec 100644
--- a/senf/Utils/Daemon/Daemon.cc
+++ b/senf/Utils/Daemon/Daemon.cc
@@ -135,8 +135,8 @@ prefix_ void senf::Daemon::openLog()
     if (! stdoutLog_.empty()) {
         fd = ::open(stdoutLog_.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0666);
         if (fd < 0)
-            SENF_THROW_SYSTEM_EXCEPTION("")
-                  << " Could not open \"" << stdoutLog_ << "\" for redirecting stdout.";
+            SENF_THROW_SYSTEM_EXCEPTION(
+                  " Could not open \"" + stdoutLog_ + "\" for redirecting stdout.");
         stdout_ = fd;
     }
     if (! stderrLog_.empty()) {
@@ -148,8 +148,8 @@ prefix_ void senf::Daemon::openLog()
         else {
             fd = ::open(stdoutLog_.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0666);
             if (fd < 0)
-                SENF_THROW_SYSTEM_EXCEPTION("")
-                    << " Could not open \"" << stderrLog_ << "\" for redirecting stderr.";
+                SENF_THROW_SYSTEM_EXCEPTION(
+                    " Could not open \"" + stderrLog_ + "\" for redirecting stderr.");
             stderr_ = fd;
         }
     }
@@ -445,17 +445,15 @@ prefix_ bool senf::Daemon::pidfileCreate()
         {
             std::ofstream pidf (tempname.c_str());
             if (! pidf)
-                SENF_THROW_SYSTEM_EXCEPTION("")
-                      << " Could not open pidfile \"" << tempname << "\" for output.";
+                SENF_THROW_SYSTEM_EXCEPTION(" Could not open pidfile \"" + tempname + "\" for output.");
             pidf << ::getpid() << std::endl;
             if (! pidf)
-                SENF_THROW_SYSTEM_EXCEPTION("")
-                      << " Could not write to pidfile \"" << tempname << "\".";
+                SENF_THROW_SYSTEM_EXCEPTION(" Could not write to pidfile \"" + tempname + "\".");
         }
 
         if (::link(tempname.c_str(), pidfile_.c_str()) < 0) {
             if (errno != EEXIST)
-                SENF_THROW_SYSTEM_EXCEPTION("") << linkErrorFormat % pidfile_ % tempname;
+                SENF_THROW_SYSTEM_EXCEPTION((linkErrorFormat % pidfile_ % tempname).str());
         }
         else {
             struct ::stat s;
@@ -488,7 +486,7 @@ prefix_ bool senf::Daemon::pidfileCreate()
         LIBC_CALL( ::unlink, (tempname.c_str() ));
         if (::link(pidfile_.c_str(), tempname.c_str()) < 0) {
             if (errno != ENOENT)
-                SENF_THROW_SYSTEM_EXCEPTION("") << linkErrorFormat % tempname % pidfile_;
+                SENF_THROW_SYSTEM_EXCEPTION( (linkErrorFormat % tempname % pidfile_).str());
             // Hmm ... the pidfile mysteriously disappeared ... try again.
             continue;
         }