[Bf-blender-cvs] [e3f369e13f6] master: Cleanup: fix some clang tidy warnings

[Jacques Lucke]

Commit: e3f369e13f614fe6bfe72dbe0dc9b617b1cd361c
Author: Jacques Lucke
Date:   Fri Aug 7 19:19:38 2020 +0200
Branches: master
https://developer.blender.org/rBe3f369e13f614fe6bfe72dbe0dc9b617b1cd361c

Cleanup: fix some clang tidy warnings

===================================================================

M	source/blender/blenlib/intern/string.c
M	source/blender/freestyle/intern/view_map/ViewMapIO.cpp

===================================================================

diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 8b4720ca1e1..8eeaaa2453a 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -87,7 +87,7 @@ char *BLI_strdupcat(const char *__restrict str1, const char *__restrict str2)
   str = MEM_mallocN(str1_len + str2_len, "strdupcat");
   s = str;
 
-  memcpy(s, str1, str1_len);
+  memcpy(s, str1, str1_len); /* NOLINT: bugprone-not-null-terminated-result */
   s += str1_len;
   memcpy(s, str2, str2_len);
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 4c4e5ce7fe9..3cbf42ed388 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -998,6 +998,7 @@ int load(istream &in, ViewMap *vm, ProgressBar *pb)
   if (fe_s) {
     bool b;
     READ(b);
+    /* NOLINTNEXTLINE: bugprone-infinite-loop */
     for (READ(fe_rle1), fe_rle2 = 0; fe_rle1 <= fe_s; fe_rle2 = fe_rle1, READ(fe_rle1)) {
       if (b) {
         for (unsigned int i = fe_rle2; i < fe_rle1; i++) {
@@ -1023,6 +1024,7 @@ int load(istream &in, ViewMap *vm, ProgressBar *pb)
   if (vv_s) {
     Nature::VertexNature nature;
     READ(nature);
+    /* NOLINTNEXTLINE: bugprone-infinite-loop */
     for (READ(vv_rle1), vv_rle2 = 0; vv_rle1 <= vv_s; vv_rle2 = vv_rle1, READ(vv_rle1)) {
       if (nature & Nature::T_VERTEX) {
         for (unsigned int i = vv_rle2; i < vv_rle1; i++) {