[{"id":1511,"web_url":"https://patchwork.libcamera.org/comment/1511/","msgid":"<9097bc7a-677d-1bf6-c7be-f01e21e0cd72@ideasonboard.com>","date":"2019-04-26T16:21:17","subject":"Re: [libcamera-devel] [PATCH 3/8] libcamera: log: Add a LogInvalid\n\tentry to LogSeverity","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 26/04/2019 17:01, Laurent Pinchart wrote:\n> enum LogSeverity values are assigned or compared to -1 to flag invalid\n> log severities. This generates compilation warnings with clang. Fix it\n> by adding an explicit LogInvalid entry to the enumeration.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n\n> ---\n> src/libcamera/include/log.h | 3 ++-\n> src/libcamera/log.cpp | 14 +++++++-------\n> 2 files changed, 9 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/libcamera/include/log.h b/src/libcamera/include/log.h\n> index 35a6fc105448..802836d23bf2 100644\n> --- a/src/libcamera/include/log.h\n> +++ b/src/libcamera/include/log.h\n> @@ -12,7 +12,8 @@\n> namespace libcamera {\n> \n> enum LogSeverity {\n> -\tLogDebug,\n> +\tLogInvalid = -1,\n> +\tLogDebug = 0,\n> \tLogInfo,\n> \tLogWarning,\n> \tLogError,\n> diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp\n> index ebf553300f5b..0ba276e5707f 100644\n> --- a/src/libcamera/log.cpp\n> +++ b/src/libcamera/log.cpp\n> @@ -174,7 +174,7 @@ void Logger::parseLogLevels()\n> \t\t\tcontinue;\n> \n> \t\tLogSeverity severity = parseLogLevel(level);\n> -\t\tif (severity == -1)\n> +\t\tif (severity == LogInvalid)\n> \t\t\tcontinue;\n> \n> \t\tlevels_.push_back({ category, severity });\n> @@ -189,7 +189,7 @@ void Logger::parseLogLevels()\n> * LogFatal, or as a string corresponding to the severity name in uppercase. Any\n> * other value is invalid.\n> *\n> - * \\return The log severity, or -1 if the string is invalid\n> + * \\return The log severity, or LogInvalid if the string is invalid\n> */\n> LogSeverity Logger::parseLogLevel(const std::string &level)\n> {\n> @@ -207,9 +207,9 @@ LogSeverity Logger::parseLogLevel(const std::string &level)\n> \t\tchar *endptr;\n> \t\tseverity = strtoul(level.c_str(), &endptr, 10);\n> \t\tif (*endptr != '\\0' || severity > LogFatal)\n> -\t\t\tseverity = -1;\n> +\t\t\tseverity = LogInvalid;\n> \t} else {\n> -\t\tseverity = -1;\n> +\t\tseverity = LogInvalid;\n> \t\tfor (unsigned int i = 0; i < ARRAY_SIZE(names); ++i) {\n> \t\t\tif (names[i] == level) {\n> \t\t\t\tseverity = i;\n> @@ -416,13 +416,13 @@ LogMessage::LogMessage(const char *fileName, unsigned int line,\n> * on the compiler type and version, and optimization level, the move\n> * constructor is defined even if it will likely never be called, and ensures\n> * that the destructor of the \\a other message will not output anything to the\n> - * log by setting the severity to -1.\n> + * log by setting the severity to LogInvalid.\n> */\n> LogMessage::LogMessage(LogMessage &&other)\n> \t: msgStream_(std::move(other.msgStream_)), category_(other.category_),\n> \t severity_(other.severity_)\n> {\n> -\tother.severity_ = static_cast(-1);\n> +\tother.severity_ = LogInvalid;\n> }\n> \n> void LogMessage::init(const char *fileName, unsigned int line)\n> @@ -445,7 +445,7 @@ void LogMessage::init(const char *fileName, unsigned int line)\n> LogMessage::~LogMessage()\n> {\n> \t/* Don't print anything if we have been moved to another LogMessage. */\n> -\tif (severity_ == -1)\n> +\tif (severity_ == LogInvalid)\n> \t\treturn;\n> \n> \tmsgStream_ << std::endl;\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 30E3260E9A\n\tfor ;\n\tFri, 26 Apr 2019 18:21:20 +0200 (CEST)","from [192.168.1.6] (net-37-182-44-227.cust.vodafonedsl.it\n\t[37.182.44.227])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AB9645F;\n\tFri, 26 Apr 2019 18:21:19 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1556295679;\n\tbh=YHh3b4CWJA/jbn5VvBkv1okPXlDZZXt1VLVw8EyDm5g=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=nS6vVvekjZxtdQFZxY8fa6U6cJauaxbfrOJEyRFvnJOyuWoMyvkJw6vpe7DNj5L9F\n\tA7CJIl5AoOISdfiy7L0OaVDfct2ocWKDn9qKP+k+9FVhSukFYeEzRUCT4b1W3Tn7ry\n\t18skjoEyo0JJsTCB8PJf5VSz2nQ7/4Y8Onwsd1PY=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190426150155.18652-1-laurent.pinchart@ideasonboard.com>\n\t<20190426150155.18652-4-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<9097bc7a-677d-1bf6-c7be-f01e21e0cd72@ideasonboard.com>","Date":"Fri, 26 Apr 2019 18:21:17 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.6.1","MIME-Version":"1.0","In-Reply-To":"<20190426150155.18652-4-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 3/8] libcamera: log: Add a LogInvalid\n\tentry to LogSeverity","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 26 Apr 2019 16:21:20 -0000"}}]