From 05ba3e788846957ddb88277ed73b54073e595907 Mon Sep 17 00:00:00 2001
From: Chen Hayat <chen.hayat@arm.com>
Date: Thu, 3 Nov 2016 12:40:42 +0200
Subject: [PATCH] Fix Klockwork compilation warning

---
 fmt/format.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fmt/format.h b/fmt/format.h
index 56ff5ff2..803d309a 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -1000,7 +1000,8 @@ inline void format_decimal(Char *buffer, UInt value, unsigned num_digits,
 
 template <typename UInt, typename Char>
 inline void format_decimal(Char *buffer, UInt value, unsigned num_digits) {
-  return format_decimal(buffer, value, num_digits, NoThousandsSep());
+  format_decimal(buffer, value, num_digits, NoThousandsSep());
+  return;
 }
 
 #ifndef _WIN32
@@ -1948,8 +1949,10 @@ class ArgFormatterBase : public ArgVisitor<Impl, void> {
   void visit_any_double(T value) { writer_.write_double(value, spec_); }
 
   void visit_bool(bool value) {
-    if (spec_.type_)
-      return visit_any_int(value);
+    if (spec_.type_) {
+      visit_any_int(value);
+      return;
+    }
     write(value);
   }