From c0759533e81731219cf26f577b9d792ea12c8bbb Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 5 Feb 2019 10:36:53 +0100
Subject: [PATCH] Cosmetic rewrite to please cppcheck.

Fix: Variable 'rem_size' is assigned a value that is never used.
---
 src/xbt/xbt_log_layout_simple.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/xbt/xbt_log_layout_simple.cpp b/src/xbt/xbt_log_layout_simple.cpp
index ae1ab91f94..aa4a1c9b9d 100644
--- a/src/xbt/xbt_log_layout_simple.cpp
+++ b/src/xbt/xbt_log_layout_simple.cpp
@@ -15,11 +15,13 @@
 extern const char *xbt_log_priority_names[8];
 extern int xbt_log_no_loc;
 
-#define check_overflow(len)                                             \
-  if ((rem_size -= (len)) > 0) {                                        \
-    p += (len);                                                         \
-  } else                                                                \
-    return 0
+#define check_overflow(len)                                                                                            \
+  do {                                                                                                                 \
+    rem_size -= (len);                                                                                                 \
+    if (rem_size <= 0)                                                                                                 \
+      return 0;                                                                                                        \
+    p += (len);                                                                                                        \
+  } while (0)
 
 static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, const char* fmt)
 {
-- 
2.20.1