Peter M. Groen / TrueMQTT-cpp

Commit 1322df2cf3e330249ad6cefe95a012a64774d000

Authored by Patric Stout
1 parent 54a4385b

chore(log): force that LOG_XXX has to be followed by a semicolon 

Last commit the hope was the {} alone was enough, but SonarCloud,
somewhat rightfully, still complains.
Inline Side-by-side
Showing 1 changed file with 10 additions and 5 deletions
src/Log.h
  View file @1322df2
... ... @@ -23,60 +23,65 @@
23 23  
24 24 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_ERROR
25 25 #define LOG_ERROR(obj, x) \
  26 + do \
26 27 { \
27 28 if (obj->log_level >= TrueMQTT::Client::LogLevel::ERROR) \
28 29 { \
29 30 obj->logger(TrueMQTT::Client::LogLevel::ERROR, x); \
30 31 } \
31   - }
  32 + } while (0)
32 33 #else
33 34 #define LOG_ERROR(obj, x)
34 35 #endif
35 36  
36 37 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_WARNING
37 38 #define LOG_WARNING(obj, x) \
  39 + do \
38 40 { \
39 41 if (obj->log_level >= TrueMQTT::Client::LogLevel::WARNING) \
40 42 { \
41 43 obj->logger(TrueMQTT::Client::LogLevel::WARNING, x); \
42 44 } \
43   - }
  45 + } while (0)
44 46 #else
45 47 #define LOG_WARNING(obj, x)
46 48 #endif
47 49  
48 50 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_INFO
49 51 #define LOG_INFO(obj, x) \
  52 + do \
50 53 { \
51 54 if (obj->log_level >= TrueMQTT::Client::LogLevel::INFO) \
52 55 { \
53 56 obj->logger(TrueMQTT::Client::LogLevel::INFO, x); \
54 57 } \
55   - }
  58 + } while (0)
56 59 #else
57 60 #define LOG_INFO(obj, x)
58 61 #endif
59 62  
60 63 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_DEBUG
61 64 #define LOG_DEBUG(obj, x) \
  65 + do \
62 66 { \
63 67 if (obj->log_level >= TrueMQTT::Client::LogLevel::DEBUG) \
64 68 { \
65 69 obj->logger(TrueMQTT::Client::LogLevel::DEBUG, x); \
66 70 } \
67   - }
  71 + } while (0)
68 72 #else
69 73 #define LOG_DEBUG(obj, x)
70 74 #endif
71 75  
72 76 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_TRACE
73 77 #define LOG_TRACE(obj, x) \
  78 + do \
74 79 { \
75 80 if (obj->log_level >= TrueMQTT::Client::LogLevel::TRACE) \
76 81 { \
77 82 obj->logger(TrueMQTT::Client::LogLevel::TRACE, x); \
78 83 } \
79   - }
  84 + } while (0)
80 85 #else
81 86 #define LOG_TRACE(obj, x)
82 87 #endif
... ...