Use type 'bool' for boolean.

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index 15a5281..cf32d88 100644 (file)
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -161,7 +161,7 @@ void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
       xbt_assert(cat->layout, "No valid layout for the appender of category %s", cat->name);
 
       /* First, try with a static buffer */
-      int done = 0;
+      bool done = false;
       std::array<char, XBT_LOG_STATIC_BUFFER_SIZE> buff;
       ev->buffer      = buff.data();
       ev->buffer_size = buff.size();

diff --git a/src/xbt/log_private.hpp b/src/xbt/log_private.hpp
index 48b0527..e07e474 100644 (file)
--- a/src/xbt/log_private.hpp
+++ b/src/xbt/log_private.hpp
@@ -16,7 +16,7 @@ struct xbt_log_appender_s {
 };
 
 struct xbt_log_layout_s {
-  int (*do_layout)(const s_xbt_log_layout_t* l, xbt_log_event_t event, const char* fmt);
+  bool (*do_layout)(const s_xbt_log_layout_t* l, xbt_log_event_t event, const char* fmt);
   void (*free_)(const s_xbt_log_layout_t* l);
   void *data;
 };

diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp
index c4b118d..872c4c5 100644 (file)
--- a/src/xbt/xbt_log_layout_format.cpp
+++ b/src/xbt/xbt_log_layout_format.cpp
@@ -22,11 +22,11 @@ static constexpr const char* ERRMSG =
     "  when:        %%d: date          %%r: app. age\n"
     "  other:       %%%%: %%             %%n: new line      %%e: plain space\n";
 
-#define check_overflow(len)                                             \
-  if ((rem_size -= (len)) > 0) {                                        \
-    p += (len);                                                         \
-  } else                                                                \
-    return 0
+#define check_overflow(len)                                                                                            \
+  if ((rem_size -= (len)) > 0) {                                                                                       \
+    p += (len);                                                                                                        \
+  } else                                                                                                               \
+    return false
 
 #define set_sz_from_precision()                                                                                        \
   if (true) {                                                                                                          \
@@ -68,7 +68,7 @@ static constexpr const char* ERRMSG =
 #define show_int(data) show_it((data), "d")
 #define show_double(data) show_it((data), "f")
 
-static int xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_event_t ev, const char* msg_fmt)
+static bool xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_event_t ev, const char* msg_fmt)
 {
   char *p = ev->buffer;
   int rem_size = ev->buffer_size;
@@ -175,7 +175,7 @@ static int xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_event
   }
   *p = '\0';
 
-  return 1;
+  return true;
 }
 
 static void xbt_log_layout_format_free(const s_xbt_log_layout_t* lay)

diff --git a/src/xbt/xbt_log_layout_simple.cpp b/src/xbt/xbt_log_layout_simple.cpp
index 8b3fbe2..8d26b51 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.cpp
+++ b/src/xbt/xbt_log_layout_simple.cpp
@@ -18,11 +18,11 @@ extern int xbt_log_no_loc;
   do {                                                                                                                 \
     rem_size -= (len);                                                                                                 \
     if (rem_size <= 0)                                                                                                 \
-      return 0;                                                                                                        \
+      return false;                                                                                                    \
     p += (len);                                                                                                        \
   } while (0)
 
-static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t ev, const char* fmt)
+static bool xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t ev, const char* fmt)
 {
   char *p = ev->buffer;
   int rem_size = ev->buffer_size;
@@ -66,7 +66,7 @@ static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t
   check_overflow(1);
   *p = '\0';
 
-  return 1;
+  return true;
 }
 
 xbt_log_layout_t xbt_log_layout_simple_new(const char*)

diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp
index c398e3c..80b2262 100644 (file)
--- a/src/xbt/xbt_str.cpp
+++ b/src/xbt/xbt_str.cpp
@@ -26,10 +26,10 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
   xbt_dynar_t res = xbt_dynar_new(sizeof(char *), nullptr);
   char* beg;
   char* end; /* pointers around the parsed chunk */
-  int in_simple_quote = 0;
-  int in_double_quote = 0;
-  int done            = 0;
-  int ctn             = 0; /* Got something in this block */
+  bool in_simple_quote = false;
+  bool in_double_quote = false;
+  bool done            = false;
+  bool ctn             = false; /* Got something in this block */
 
   if (s[0] == '\0')
     return res;
@@ -42,7 +42,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
   while (not done) {
     switch (*end) {
     case '\\':
-      ctn = 1;
+      ctn = true;
       /* Protected char; move it closer */
       memmove(end, end + 1, strlen(end));
       if (*end == '\0')
@@ -50,7 +50,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
       end++;                    /* Pass the protected char */
       break;
     case '\'':
-      ctn = 1;
+      ctn = true;
       if (not in_double_quote) {
         in_simple_quote = not in_simple_quote;
         memmove(end, end + 1, strlen(end));
@@ -60,7 +60,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
       }
       break;
     case '"':
-      ctn = 1;
+      ctn = true;
       if (not in_simple_quote) {
         in_double_quote = not in_double_quote;
         memmove(end, end + 1, strlen(end));
@@ -82,14 +82,14 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
         break;
       }
       if (*end == '\0')
-        done = 1;
+        done = true;
 
       *end = '\0';
       if (ctn) {
         /* Found a separator. Push the string if contains something */
         xbt_dynar_push(res, &beg);
       }
-      ctn = 0;
+      ctn = false;
 
       if (done)
         break;
@@ -101,7 +101,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
       end = beg;
       break;
     default:
-      ctn = 1;
+      ctn = true;
       end++;
     }
   }