Minor performance tweaks.

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index bbf7df3916691a25fcf244f54b22a3e8a9240e74..a14371c62fd2080d4c802127746bda7b67612594 100644 (file)
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -127,9 +127,11 @@ void DelegationComponent::DelegationTimerHandler(void)
                std::vector<Endpoint::Ptr>::iterator cit;
 
                if (!candidates.empty()) {
+#ifdef _DEBUG
                        std::ostringstream msgbuf;
                        msgbuf << "Service: " << service->GetName() << ", candidates: " << candidates.size();
                        Log(LogDebug, "delegation", msgbuf.str());
+#endif /* _DEBUG */
 
                        BOOST_FOREACH(const Endpoint::Ptr& candidate, candidates) {
                                avg_services += histogram[candidate];

diff --git a/lib/base/process-unix.cpp b/lib/base/process-unix.cpp
index f86ed700a176377b775983a09e7117a138f6861b..1b90a9eb611a348148c7514fb543d76606e48c73 100644 (file)
--- a/lib/base/process-unix.cpp
+++ b/lib/base/process-unix.cpp
@@ -155,17 +155,17 @@ ProcessResult Process::Run(void)
        (void) close(fds[1]);
 
                char buffer[512];
-       int rc;
 
        std::ostringstream outputStream;
 
-       do {
-               rc = read(fd, buffer, sizeof(buffer));
+       for (;;) {
+               int rc = read(fd, buffer, sizeof(buffer));
 
-               if (rc > 0) {
-                       outputStream.write(buffer, rc);
-               }
-       } while (rc > 0);
+               if (rc <= 0)
+                       break;
+
+               outputStream.write(buffer, rc);
+       }
 
        String output = outputStream.str();