From b13585a69755fe93431bc9be71fa1c851c773971 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Tue, 13 Jul 2021 10:11:20 +0100 Subject: [PATCH] Fix code scanning alert: "Multiplication result converted to larger type". https://github.com/Exiv2/exiv2/blob/9284b58bfc99b788b714daddcff1c1f07174b7d2/samples/Jzon.cpp#L61-L61 --- samples/Jzon.cpp | 8 ++++---- samples/Jzon.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/Jzon.cpp b/samples/Jzon.cpp index 617cc832..8081607d 100644 --- a/samples/Jzon.cpp +++ b/samples/Jzon.cpp @@ -55,7 +55,7 @@ namespace Jzon newline = (format.newline ? "\n" : spacing); } - std::string GetIndentation(unsigned int level) const + std::string GetIndentation(size_t level) const { if (format.newline) return std::string(format.indentSize * level, indentationChar); @@ -727,7 +727,7 @@ namespace Jzon return result; } - void Writer::writeNode(const Node &node, unsigned int level) + void Writer::writeNode(const Node &node, size_t level) { switch (node.GetType()) { case Node::T_OBJECT: @@ -741,7 +741,7 @@ namespace Jzon break; } } - void Writer::writeObject(const Object &node, unsigned int level) + void Writer::writeObject(const Object &node, size_t level) { result += "{" + fi->GetNewline(); @@ -757,7 +757,7 @@ namespace Jzon result += fi->GetNewline() + fi->GetIndentation(level) + "}"; } - void Writer::writeArray(const Array &node, unsigned int level) + void Writer::writeArray(const Array &node, size_t level) { result += "[" + fi->GetNewline(); diff --git a/samples/Jzon.h b/samples/Jzon.h index da20e173..00babe56 100644 --- a/samples/Jzon.h +++ b/samples/Jzon.h @@ -389,9 +389,9 @@ namespace Jzon // Disable assignment operator Writer &operator=(const Writer&) = delete; private: - void writeNode(const Node &node, unsigned int level); - void writeObject(const Object &node, unsigned int level); - void writeArray(const Array &node, unsigned int level); + void writeNode(const Node &node, size_t level); + void writeObject(const Object &node, size_t level); + void writeArray(const Array &node, size_t level); void writeValue(const Value &node); std::string result;