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,60 +23,65 @@
23 23
24 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_ERROR 24 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_ERROR
25 #define LOG_ERROR(obj, x) \ 25 #define LOG_ERROR(obj, x) \
  26 + do \
26 { \ 27 { \
27 if (obj->log_level >= TrueMQTT::Client::LogLevel::ERROR) \ 28 if (obj->log_level >= TrueMQTT::Client::LogLevel::ERROR) \
28 { \ 29 { \
29 obj->logger(TrueMQTT::Client::LogLevel::ERROR, x); \ 30 obj->logger(TrueMQTT::Client::LogLevel::ERROR, x); \
30 } \ 31 } \
31 - } 32 + } while (0)
32 #else 33 #else
33 #define LOG_ERROR(obj, x) 34 #define LOG_ERROR(obj, x)
34 #endif 35 #endif
35 36
36 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_WARNING 37 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_WARNING
37 #define LOG_WARNING(obj, x) \ 38 #define LOG_WARNING(obj, x) \
  39 + do \
38 { \ 40 { \
39 if (obj->log_level >= TrueMQTT::Client::LogLevel::WARNING) \ 41 if (obj->log_level >= TrueMQTT::Client::LogLevel::WARNING) \
40 { \ 42 { \
41 obj->logger(TrueMQTT::Client::LogLevel::WARNING, x); \ 43 obj->logger(TrueMQTT::Client::LogLevel::WARNING, x); \
42 } \ 44 } \
43 - } 45 + } while (0)
44 #else 46 #else
45 #define LOG_WARNING(obj, x) 47 #define LOG_WARNING(obj, x)
46 #endif 48 #endif
47 49
48 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_INFO 50 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_INFO
49 #define LOG_INFO(obj, x) \ 51 #define LOG_INFO(obj, x) \
  52 + do \
50 { \ 53 { \
51 if (obj->log_level >= TrueMQTT::Client::LogLevel::INFO) \ 54 if (obj->log_level >= TrueMQTT::Client::LogLevel::INFO) \
52 { \ 55 { \
53 obj->logger(TrueMQTT::Client::LogLevel::INFO, x); \ 56 obj->logger(TrueMQTT::Client::LogLevel::INFO, x); \
54 } \ 57 } \
55 - } 58 + } while (0)
56 #else 59 #else
57 #define LOG_INFO(obj, x) 60 #define LOG_INFO(obj, x)
58 #endif 61 #endif
59 62
60 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_DEBUG 63 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_DEBUG
61 #define LOG_DEBUG(obj, x) \ 64 #define LOG_DEBUG(obj, x) \
  65 + do \
62 { \ 66 { \
63 if (obj->log_level >= TrueMQTT::Client::LogLevel::DEBUG) \ 67 if (obj->log_level >= TrueMQTT::Client::LogLevel::DEBUG) \
64 { \ 68 { \
65 obj->logger(TrueMQTT::Client::LogLevel::DEBUG, x); \ 69 obj->logger(TrueMQTT::Client::LogLevel::DEBUG, x); \
66 } \ 70 } \
67 - } 71 + } while (0)
68 #else 72 #else
69 #define LOG_DEBUG(obj, x) 73 #define LOG_DEBUG(obj, x)
70 #endif 74 #endif
71 75
72 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_TRACE 76 #if MIN_LOGGER_LEVEL >= LOGGER_LEVEL_TRACE
73 #define LOG_TRACE(obj, x) \ 77 #define LOG_TRACE(obj, x) \
  78 + do \
74 { \ 79 { \
75 if (obj->log_level >= TrueMQTT::Client::LogLevel::TRACE) \ 80 if (obj->log_level >= TrueMQTT::Client::LogLevel::TRACE) \
76 { \ 81 { \
77 obj->logger(TrueMQTT::Client::LogLevel::TRACE, x); \ 82 obj->logger(TrueMQTT::Client::LogLevel::TRACE, x); \
78 } \ 83 } \
79 - } 84 + } while (0)
80 #else 85 #else
81 #define LOG_TRACE(obj, x) 86 #define LOG_TRACE(obj, x)
82 #endif 87 #endif