From 60d9c2bc1d8095f06c13fbf1bcce2d5c587a3a64 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Tue, 13 May 2014 18:08:34 -0400
Subject: Remove trailing whitespace from error messages

Fix for bug #867
---
 src/context.h  | 4 ++--
 src/convert.cc | 2 +-
 src/error.cc   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/context.h b/src/context.h
index 9f5bfe8f..27b733a1 100644
--- a/src/context.h
+++ b/src/context.h
@@ -101,10 +101,10 @@ public:
   }
 
   void warning(const string& what) const {
-    warning_func(location() + what);
+    warning_func(location() + " " + what);
   }
   void warning(const boost::format& what) const {
-    warning_func(location() + string(what.str()));
+    warning_func(location() + " " + string(what.str()));
   }
 };
 
diff --git a/src/convert.cc b/src/convert.cc
index 2fcec38e..816271f2 100644
--- a/src/convert.cc
+++ b/src/convert.cc
@@ -86,7 +86,7 @@ value_t convert_command(call_scope_t& args)
       if (entry != journal.checksum_map.end()) {
         INFO(file_context(reader.get_pathname(),
                           reader.get_linenum())
-             << "Ignoring known UUID " << ref);
+             << " " << "Ignoring known UUID " << ref);
         checked_delete(xact);     // ignore it
         continue;
       }
diff --git a/src/error.cc b/src/error.cc
index 035c5f19..830dacb0 100644
--- a/src/error.cc
+++ b/src/error.cc
@@ -49,7 +49,7 @@ string error_context()
 string file_context(const path& file, const std::size_t line)
 {
   std::ostringstream buf;
-  buf << '"' << file.string() << "\", line " << line << ": ";
+  buf << '"' << file.string() << "\", line " << line << ":";
   return buf.str();
 }
 
-- 
cgit v1.2.3