From faed51f195deef255cfc46dadd4996aa2b5b4919 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Sat, 26 Jul 2025 12:08:15 +0000
Subject: [PATCH] Cleanup: remove redundant calls to strlen

---
 source/blender/blenkernel/intern/cryptomatte.cc    | 2 +-
 source/blender/blenlib/intern/string_utils.cc      | 4 ++--
 source/blender/blenloader/intern/versioning_290.cc | 2 +-
 source/blender/blentranslation/intern/blt_lang.cc  | 2 +-
 source/blender/editors/screen/workspace_edit.cc    | 2 +-
 source/blender/editors/space_node/node_edit.cc     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc
index e26e679828d..6369fd5fd50 100644
--- a/source/blender/blenkernel/intern/cryptomatte.cc
+++ b/source/blender/blenkernel/intern/cryptomatte.cc
@@ -264,7 +264,7 @@ char *BKE_cryptomatte_entries_to_matte_id(NodeCryptomatte *node_storage)
     if (!first) {
       BLI_dynstr_append(matte_id, ",");
     }
-    if (STRNLEN(entry->name) != 0) {
+    if (entry->name[0] != '\0') {
       BLI_dynstr_nappend(matte_id, entry->name, sizeof(entry->name));
     }
     else {
diff --git a/source/blender/blenlib/intern/string_utils.cc b/source/blender/blenlib/intern/string_utils.cc
index 08c1682529b..0dde3f0ceb2 100644
--- a/source/blender/blenlib/intern/string_utils.cc
+++ b/source/blender/blenlib/intern/string_utils.cc
@@ -317,8 +317,8 @@ size_t BLI_string_flip_side_name(char *name_dst,
       if (strip_number == false) {
         BLI_strncpy(number, index, name_dst_maxncpy);
       }
-      *index = 0;
-      len = BLI_strnlen(name_dst, name_dst_maxncpy);
+      *index = '\0';
+      len = size_t(index - name_dst); /* Same as `strlen(name_dst)`. */
     }
   }
 
diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc
index 23e6bcaae42..34a6b8ad500 100644
--- a/source/blender/blenloader/intern/versioning_290.cc
+++ b/source/blender/blenloader/intern/versioning_290.cc
@@ -1549,7 +1549,7 @@ void blo_do_versions_290(FileData *fd, Library * /*lib*/, Main *bmain)
             if (node->type_legacy == CMP_NODE_CRYPTOMATTE_LEGACY) {
               NodeCryptomatte *storage = (NodeCryptomatte *)node->storage;
               char *matte_id = storage->matte_id;
-              if (matte_id == nullptr || strlen(storage->matte_id) == 0) {
+              if ((matte_id == nullptr) || (storage->matte_id[0] == '\0')) {
                 continue;
               }
               BKE_cryptomatte_matte_id_to_entries(storage, storage->matte_id);
diff --git a/source/blender/blentranslation/intern/blt_lang.cc b/source/blender/blentranslation/intern/blt_lang.cc
index 043803af2df..610fa337549 100644
--- a/source/blender/blentranslation/intern/blt_lang.cc
+++ b/source/blender/blentranslation/intern/blt_lang.cc
@@ -144,7 +144,7 @@ static void fill_locales()
 
           if (id == 0) {
             /* The DEFAULT/Automatic item... */
-            if (BLI_strnlen(loc, 2)) {
+            if (loc[0] != '\0') {
               MEM_freeN(desc); /* Not used here. */
               locales[id] = "";
               /* Keep this tip in sync with the one in rna_userdef
diff --git a/source/blender/editors/screen/workspace_edit.cc b/source/blender/editors/screen/workspace_edit.cc
index 0e12a5504e6..950989a14e8 100644
--- a/source/blender/editors/screen/workspace_edit.cc
+++ b/source/blender/editors/screen/workspace_edit.cc
@@ -453,7 +453,7 @@ static void workspace_append_button(uiLayout *layout,
   const ID *id = (ID *)workspace;
   const char *filepath = from_main->filepath;
 
-  if (strlen(filepath) == 0) {
+  if (filepath[0] == '\0') {
     filepath = BLO_EMBEDDED_STARTUP_BLEND;
   }
 
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 969a529e52b..fd3c97d172c 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -2131,7 +2131,7 @@ static wmOperatorStatus node_output_file_add_socket_exec(bContext *C, wmOperator
 
   RNA_string_get(op->ptr, "file_path", file_path);
 
-  if (strlen(file_path) != 0) {
+  if (file_path[0] != '\0') {
     ntreeCompositOutputFileAddSocket(ntree, node, file_path, &scene->r.im_format);
   }
   else {