deduplicate string compare helpers

Author: recp

src/io/3mf/imp/3mf.c

@@ -105,20 +105,6 @@ typedef struct AK3MFBlendMethods {
   bool              cached;
 } AK3MFBlendMethods;
 
-static
-bool
-ak_3mf_slice_eq_cstr(const char * __restrict slice,
-                     size_t                  sliceLen,
-                     const char * __restrict str) {
-  size_t len;
-
-  if (!slice || !str)
-    return false;
-
-  len = strlen(str);
-  return len == sliceLen && memcmp(slice, str, len) == 0;
-}
-
 AK_INLINE
 bool
 ak_3mf_space(char c) {
@@ -180,7 +166,8 @@ ak_3mf_cstr_ends_lit(const char * __restrict str,
     return false;
 
   len = strlen(str);
-  return len >= litLen && memcmp(str + len - litLen, lit, litLen) == 0;
+  return len >= litLen
+         && ak_str_eq_fast(str + len - litLen, litLen, lit, litLen);
 }
 
 static
@@ -299,17 +286,7 @@ ak_3mf_entry_name_eq_sz(const char * __restrict name,
 
   name = ak_3mf_skip_root_slash(name, &nameLen);
   path = ak_3mf_skip_root_slash(path, &pathLen);
-  return nameLen == pathLen && memcmp(name, path, nameLen) == 0;
-}
-
-static
-bool
-ak_3mf_entry_name_eq(const char * __restrict name,
-                     size_t                  nameLen,
-                     const char * __restrict path) {
-  return path
-         ? ak_3mf_entry_name_eq_sz(name, nameLen, path, strlen(path))
-         : false;
+  return ak_str_eq_fast(name, nameLen, path, pathLen);
 }
 
 static
@@ -341,7 +318,7 @@ ak_3mf_xmla_local_sz(const xml_t * __restrict xml,
       attrName     = colon + 1u;
     }
 
-    if (attrNameLen == nameLen && memcmp(attrName, name, nameLen) == 0)
+    if (ak_str_eq_fast(attrName, attrNameLen, name, nameLen))
       return attr;
   }
 
@@ -389,7 +366,7 @@ ak_3mf_attr_value_eq_entry(const xml_attr_t * __restrict attr,
 
   value    = attr->val;
   valueLen = attr->valsize;
-  return ak_3mf_entry_name_eq(value, valueLen, entryName);
+  return ak_3mf_entry_name_eq_sz(value, valueLen, entryName, strlen(entryName));
 }
 
 static
@@ -408,7 +385,7 @@ ak_3mf_model_path_eq(const char * __restrict a,
   bLen = strlen(b);
   a = ak_3mf_skip_root_slash(a, &aLen);
   b = ak_3mf_skip_root_slash(b, &bLen);
-  return aLen == bLen && memcmp(a, b, aLen) == 0;
+  return ak_str_eq_fast(a, aLen, b, bLen);
 }
 
 static
@@ -705,7 +682,7 @@ ak_3mf_tag_sz(const xml_t * __restrict xml,
   if (!tag || !ak_3mf_tag_local(xml, &xmlTag, &xmlTagSize))
     return false;
 
-  return tagSize == xmlTagSize && memcmp(xmlTag, tag, tagSize) == 0;
+  return ak_str_eq_fast(xmlTag, xmlTagSize, tag, tagSize);
 }
 
 static
@@ -1250,6 +1227,9 @@ ak_3mf_content_type_dup(AkDoc       * __restrict doc,
 
     ext = ak_3mf_entry_extension(entryName);
     if (ext) {
+      size_t extLen;
+
+      extLen = strlen(ext);
       for (child = contentTypesRoot->val; child; child = child->next) {
         xml_attr_t *extension;
         xml_attr_t *contentType;
@@ -1260,7 +1240,7 @@ ak_3mf_content_type_dup(AkDoc       * __restrict doc,
         extension = AK_3MF_XMLA(child, Extension);
         if (!extension
             || !extension->val
-            || !ak_3mf_slice_eq_cstr(extension->val, extension->valsize, ext))
+            || !ak_str_eq_fast(extension->val, extension->valsize, ext, extLen))
           continue;
 
         contentType = AK_3MF_XMLA(child, ContentType);
@@ -1760,7 +1740,11 @@ ak_3mf_import_package_part_visitor(const AkZipEntryInfo * __restrict info,
     return true;
   if (AK_3MF_ENTRY_NAME_EQ(info->name, info->nameLen, AK_3MF_CONTENT_TYPES_PART)
       || AK_3MF_ENTRY_NAME_EQ(info->name, info->nameLen, AK_3MF_ROOT_RELS_PART)
-      || ak_3mf_entry_name_eq(info->name, info->nameLen, st->modelPath))
+      || (st->modelPath
+          && ak_3mf_entry_name_eq_sz(info->name,
+                                     info->nameLen,
+                                     st->modelPath,
+                                     strlen(st->modelPath))))
     return true;
 
   entryName = malloc(info->nameLen + 1u);

src/io/dae/1.4/dae14.c

@@ -17,6 +17,7 @@
 #include "../../../../include/ak/assetkit.h"
 #include "../common.h"
 #include "dae14.h"
+#include "../../../string_fast.h"
 
 static
 AkNewParam*
@@ -82,9 +83,7 @@ dae14_find_image_by_id_n(AkDoc * __restrict doc,
     const char *imageId;
 
     imageId = ak_getId(image);
-    if (imageId
-        && strlen(imageId) == idLen
-        && memcmp(imageId, id, idLen) == 0)
+    if (ak_str_eq_cstr_fast(imageId, id, idLen))
       return image;
   }
 
@@ -111,7 +110,10 @@ dae14_find_image_id_for_surface_source(DAEState * __restrict dst,
 
   suffixLen = sizeof(suffix) - 1;
   if (sidLen > suffixLen
-      && memcmp(sid + sidLen - suffixLen, suffix, suffixLen) == 0) {
+      && ak_str_eq_fast(sid + sidLen - suffixLen,
+                        suffixLen,
+                        suffix,
+                        suffixLen)) {
     if ((image = dae14_find_image_by_id_n(doc, sid, sidLen - suffixLen)))
       return ak_getId(image);
   }

src/io/dae/exp/image.c

@@ -62,27 +62,19 @@ dae_prepare_texture_image(DAEExpState  * __restrict st,
   return !tex || !tex->image || dae_prepare_extra_image(st, tex->image);
 }
 
-static
-bool
-dae_cstr_eq_token(const char * __restrict val,
-                  const char * __restrict token,
-                  size_t                  tokenLen) {
-  return ak_str_eq_cstr_fast(val, token, tokenLen);
-}
-
 static
 const char*
 dae_image_mime_ext(AkImageSource * __restrict source) {
   const char *mime;
 
   mime = source ? source->mimeType : NULL;
-  if (dae_cstr_eq_token(mime, "image/png", sizeof("image/png") - 1u))
+  if (ak_str_eq_cstr_fast(mime, "image/png", sizeof("image/png") - 1u))
     return ".png";
-  if (dae_cstr_eq_token(mime, "image/jpeg", sizeof("image/jpeg") - 1u))
+  if (ak_str_eq_cstr_fast(mime, "image/jpeg", sizeof("image/jpeg") - 1u))
     return ".jpg";
-  if (dae_cstr_eq_token(mime, "image/webp", sizeof("image/webp") - 1u))
+  if (ak_str_eq_cstr_fast(mime, "image/webp", sizeof("image/webp") - 1u))
     return ".webp";
-  if (dae_cstr_eq_token(mime, "image/ktx2", sizeof("image/ktx2") - 1u))
+  if (ak_str_eq_cstr_fast(mime, "image/ktx2", sizeof("image/ktx2") - 1u))
     return ".ktx2";
 
   return ".bin";

src/io/dae/fx/techn.c

@@ -23,6 +23,7 @@
 #include "../1.4/image.h"
 #include "../bugfix/transp.h"
 #include "../../../default/material.h"
+#include "../../../string_fast.h"
 
 #include <string.h>
 
@@ -44,7 +45,7 @@ bool
 dae_xmlAttrEq(const xml_attr_t * __restrict attr,
               const char       * __restrict value,
               size_t                        len) {
-  return attr && attr->val && attr->valsize == len && memcmp(attr->val, value, len) == 0;
+  return attr && ak_str_eq_fast(attr->val, attr->valsize, value, len);
 }
 
 AK_HIDE

src/io/gltf/exp/common.h

@@ -19,6 +19,7 @@
 
 #include "../../../../include/ak/assetkit.h"
 #include "../../../image/export.h"
+#include "../../../string_fast.h"
 
 #include <ds/rb.h>
 

src/io/gltf/exp/extra.c

@@ -44,16 +44,6 @@ gltf_extra_type(const AkTreeNode * __restrict node) {
   return NULL;
 }
 
-static
-bool
-gltf_extra_type_eq(const AkTreeNode * __restrict node,
-                   const char       * __restrict type) {
-  const char *nodeType;
-
-  nodeType = gltf_extra_type(node);
-  return nodeType && strcmp(nodeType, type) == 0;
-}
-
 AkTreeNode*
 gltf_extra_extensions_node(AkTreeNode * __restrict extra) {
   return gltf_extra_child(extra,
@@ -80,16 +70,6 @@ gltf_extra_root_required(GLTFExpState * __restrict st) {
                           _s_gltf_extensionsRequired_len);
 }
 
-static
-bool
-gltf_extra_value_eq(const AkTreeNode * __restrict node,
-                    const char       * __restrict name,
-                    size_t                        nameLen) {
-  return node
-         && node->val
-         && ak_str_eq_cstr_fast(node->val, name, nameLen);
-}
-
 static
 bool
 gltf_extra_array_contains(const AkTreeNode * __restrict array,
@@ -98,7 +78,7 @@ gltf_extra_array_contains(const AkTreeNode * __restrict array,
   AkTreeNode *child;
 
   for (child = array ? array->chld : NULL; child; child = child->next) {
-    if (gltf_extra_value_eq(child, name, nameLen))
+    if (child->val && ak_str_eq_cstr_fast(child->val, name, nameLen))
       return true;
   }
 
@@ -154,15 +134,6 @@ gltf_extra_json_number(const char * __restrict val, size_t len) {
   return i == len;
 }
 
-static
-bool
-gltf_extra_literal(const char * __restrict val,
-                   size_t                  len,
-                   const char * __restrict literal,
-                   size_t                  literalLen) {
-  return len == literalLen && memcmp(val, literal, literalLen) == 0;
-}
-
 static
 bool
 gltf_extra_reserved_root_child(AkTreeNode * __restrict node) {
@@ -259,9 +230,9 @@ gltf_write_extra_leaf(GLTFExpWriter * __restrict w,
   }
 
   len = strlen(val);
-  if (gltf_extra_literal(val, len, "true", 4)
-      || gltf_extra_literal(val, len, "false", 5)
-      || gltf_extra_literal(val, len, "null", 4)
+  if (ak_str_eq_fast(val, len, "true", 4)
+      || ak_str_eq_fast(val, len, "false", 5)
+      || ak_str_eq_fast(val, len, "null", 4)
       || gltf_extra_json_number(val, len)) {
     gltf_w_raw(w, val, len);
     return;
@@ -277,7 +248,7 @@ gltf_extra_has_json_extras(AkTreeNode * __restrict node) {
   if (!node)
     return false;
 
-  if (gltf_extra_type_eq(node, "array"))
+  if (ak_str_eq_cstr_fast(gltf_extra_type(node), "array", sizeof("array") - 1u))
     return true;
 
   if (!node->chld)
@@ -297,7 +268,11 @@ gltf_write_extra_json_extras(GLTFExpWriter * __restrict w,
   AkTreeNode *child;
   bool        comma;
 
-  if (!node || gltf_extra_type_eq(node, "array") || !node->chld) {
+  if (!node
+      || ak_str_eq_cstr_fast(gltf_extra_type(node),
+                             "array",
+                             sizeof("array") - 1u)
+      || !node->chld) {
     gltf_write_extra_json_value(w, node);
     return;
   }
@@ -370,14 +345,18 @@ gltf_write_extra_extensions_member(GLTFExpWriter           * __restrict w,
 void
 gltf_write_extra_json_value(GLTFExpWriter * __restrict w,
                             AkTreeNode    * __restrict node) {
+  const char *nodeType;
+
   if (!node) {
     gltf_w_raw(w, "null", 4);
     return;
   }
 
-  if (gltf_extra_type_eq(node, "array")) {
+  nodeType = gltf_extra_type(node);
+  if (ak_str_eq_cstr_fast(nodeType, "array", sizeof("array") - 1u)) {
     gltf_write_extra_array(w, node);
-  } else if (gltf_extra_type_eq(node, "object") || node->chld) {
+  } else if (ak_str_eq_cstr_fast(nodeType, "object", sizeof("object") - 1u)
+             || node->chld) {
     gltf_write_extra_object(w, node);
   } else {
     gltf_write_extra_leaf(w, node);