From e15595bc3cd156cbd6c901d1e6821be1a6afec7b Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 27 Nov 2017 10:17:58 -0800
Subject: [PATCH] Clean up some string concatenation

---
 src/context.cpp | 18 ++++++------------
 src/source.cpp  |  9 +++------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/context.cpp b/src/context.cpp
index 495ba2c..a9af56d 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -836,13 +836,10 @@ BufferOrExceptT ContextImpl::doCreateBuffer(StringView name, Vector<UniquePtr<Bu
     // Get the format before calling the bufferLoading message handler, to
     // ensure it's something OpenAL can handle.
     ALenum format = GetFormat(chans, type);
-    if(format == AL_NONE)
+    if(UNLIKELY(format == AL_NONE))
     {
-        String str("Unsupported format (");
-        str += GetSampleTypeName(type);
-        str += ", ";
-        str += GetChannelConfigName(chans);
-        str += ")";
+        auto str = String("Unsupported format (")+GetSampleTypeName(type)+", "+
+                   GetChannelConfigName(chans)+")";
         return std::make_exception_ptr(std::runtime_error(str));
     }
 
@@ -879,13 +876,10 @@ BufferOrExceptT ContextImpl::doCreateBufferAsync(StringView name, Vector<UniqueP
         return std::make_exception_ptr(std::runtime_error("No samples for buffer"));
 
     ALenum format = GetFormat(chans, type);
-    if(format == AL_NONE)
+    if(UNLIKELY(format == AL_NONE))
     {
-        String str("Unsupported format (");
-        str += GetSampleTypeName(type);
-        str += ", ";
-        str += GetChannelConfigName(chans);
-        str += ")";
+        auto str = String("Unsupported format (")+GetSampleTypeName(type)+", "+
+                   GetChannelConfigName(chans)+")";
         return std::make_exception_ptr(std::runtime_error(str));
     }
 
diff --git a/src/source.cpp b/src/source.cpp
index cdeaa17..9cc5df5 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -85,13 +85,10 @@ public:
         mFrequency = srate;
         mFrameSize = FramesToBytes(1, chans, type);
         mFormat = GetFormat(chans, type);
-        if(mFormat == AL_NONE)
+        if(UNLIKELY(mFormat == AL_NONE))
         {
-            String str("Unsupported format (");
-            str += GetSampleTypeName(type);
-            str += ", ";
-            str += GetChannelConfigName(chans);
-            str += ")";
+            auto str = String("Unsupported format (")+GetSampleTypeName(type)+", "+
+                       GetChannelConfigName(chans)+")";
             throw std::runtime_error(str);
         }
 
-- 
2.11.4.GIT