From ad05019445d8a4ff636ba2d9c4bdaf14fa8ceba7 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 20 Mar 2018 12:59:38 +0200 Subject: [PATCH] Avoid clashes with TRUE/FALSE TRUE/FALSE may be visible as defines. Consequently better not to use them as names. --- server/modules/filter/cache/cachefiltersession.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc index 9901c21e6..59f7e7bf7 100644 --- a/server/modules/filter/cache/cachefiltersession.cc +++ b/server/modules/filter/cache/cachefiltersession.cc @@ -1169,21 +1169,21 @@ bool get_truth_value(const char* begin, const char* end, bool* pValue) { bool rv = false; - static const char TRUE[] = "true"; - static const char FALSE[] = "false"; + static const char ZTRUE[] = "true"; + static const char ZFALSE[] = "false"; - static const size_t nTrue = sizeof(TRUE) - 1; - static const size_t nFalse = sizeof(FALSE) - 1; + static const size_t nTrue = sizeof(ZTRUE) - 1; + static const size_t nFalse = sizeof(ZFALSE) - 1; int len = (end - begin); - if (((len == nTrue) && (strncasecmp(begin, TRUE, nTrue) == 0)) || + if (((len == nTrue) && (strncasecmp(begin, ZTRUE, nTrue) == 0)) || ((len == 1) && (*begin == '1'))) { *pValue = true; rv = true; } - else if (((len == nFalse) && (strncasecmp(begin, FALSE, nFalse) == 0)) || + else if (((len == nFalse) && (strncasecmp(begin, ZFALSE, nFalse) == 0)) || ((len == 1) && (*begin == '0'))) {