From: Frank Ch. Eigler <fche@redhat.com>
Date: Tue, 11 Oct 2011 13:39:56 +0000 (-0400)
Subject: PR3823: fix accidental whitespace included in type mismatch messages for i18n
X-Git-Tag: release-1.7~151^2~104
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3c5dc9341005e128957e5ea5d6aa199d4011c30c;p=systemtap.git

PR3823: fix accidental whitespace included in type mismatch messages for i18n

* elaborate.cxx (typeresolution_info::mismatch): eliminate excess space.

Reported-by: Petr Muller <pmuller@redhat.com> and the fine fujitsu testsuite
---

diff --git a/elaborate.cxx b/elaborate.cxx
index 194460f12..5655444d3 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -4912,7 +4912,7 @@ typeresolution_info::mismatch (const token* tok, exp_type t1, exp_type t2)
 	}
       if (!tok_resolved)
 	{
-          msg << _F("type mismatch ( %s vs. %s )",
+          msg << _F("type mismatch (%s vs. %s)",
                     lex_cast(t1).c_str(), lex_cast(t2).c_str());
 	}
       else
@@ -4926,14 +4926,14 @@ typeresolution_info::mismatch (const token* tok, exp_type t1, exp_type t2)
 		  break;
 		}
 	    }
-          msg << _F("type mismatch ( %s vs. %s )",
+          msg << _F("type mismatch (%s vs. %s)",
                     lex_cast(t1).c_str(), lex_cast(t2).c_str());
 	  if (!tok_printed)
 	    {
 	      //error for possible mismatch in the earlier resolved token
 	      printed_toks.push_back (resolved_toks[i]);
 	      stringstream type_msg;
-              type_msg << _F("type was first inferred here ( %s )", lex_cast(t2).c_str());
+              type_msg << _F("type was first inferred here (%s)", lex_cast(t2).c_str());
 	      err1 = new semantic_error (type_msg.str(), resolved_toks[i]);
 	    }
 	}