From 68449dc541f325150d4f6766f3d81086181ad22c Mon Sep 17 00:00:00 2001
From: twx1232375 <tsvetkova.elena@huawei-partners.com>
Date: Tue, 22 Jul 2025 17:31:02 +0300
Subject: [PATCH] added safe functions

---
 interop/src/cpp/interop-utils.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/interop/src/cpp/interop-utils.h b/interop/src/cpp/interop-utils.h
index fd7cb5d3a7..45624c5ef2 100644
--- a/interop/src/cpp/interop-utils.h
+++ b/interop/src/cpp/interop-utils.h
@@ -21,44 +21,44 @@
 
 #ifdef __STDC_LIB_EXT1__
     #include "securec.h"
-    #define USE_SAFE(name, ...) name##_s(__VA_ARGS__)
+    #define USE_SAFE(subject_name, predicate_name, ...) subject_name##predicate_name##_s(__VA_ARGS__)
 #else
-    #define USE_SAFE(name, ...) name(__VA_ARGS__)
+    #define USE_SAFE(subject_name, predicate_name, ...) subject_name##predicate_name(__VA_ARGS__)
 #endif
 
 inline char *interop_strcpy(char *dest, size_t destsz, const char *src)
 {
 #ifdef __STDC_LIB_EXT1__
-    return reinterpret_cast<char(*)>(USE_SAFE(strcpy, dest, reinterpret_cast<rsize_t>(destsz), src));
+    return reinterpret_cast<char(*)>(USE_SAFE(str, cpy, dest, reinterpret_cast<rsize_t>(destsz), src));
 #else
-    return USE_SAFE(strcpy, dest, src);
+    return USE_SAFE(str, cpy, dest, src);
 #endif
 }
 
 inline char *interop_strcat(char *dest, size_t destsz, const char *src)
 {
 #ifdef __STDC_LIB_EXT1__
-    return reinterpret_cast<char(*)>(USE_SAFE(strcat, dest, reinterpret_cast<rsize_t>(destsz), src));
+    return reinterpret_cast<char(*)>(USE_SAFE(str, cat, dest, reinterpret_cast<rsize_t>(destsz), src));
 #else
-    return USE_SAFE(strcat, dest, src);
+    return USE_SAFE(str, cat, dest, src);
 #endif
 }
 
 inline void *interop_memcpy(void *dest, size_t destsz, const void *src, size_t count)
 {
 #ifdef __STDC_LIB_EXT1__
-    return reinterpret_cast<void(*)>(USE_SAFE(memcpy, dest, reinterpret_cast<rsize_t>(destsz), src, count));
+    return reinterpret_cast<void(*)>(USE_SAFE(mem, cpy, dest, reinterpret_cast<rsize_t>(destsz), src, count));
 #else
-    return USE_SAFE(memcpy, dest, src, count);
+    return USE_SAFE(mem, cpy, dest, src, count);
 #endif
 }
 
 inline void *interop_memset(void *dest, size_t destsz, int ch, size_t count)
 {
 #ifdef __STDC_LIB_EXT1__
-    return reinterpret_cast<void(*)>(USE_SAFE(memset, dest, reinterpret_cast<rsize_t>(destsz), ch, count))
+    return reinterpret_cast<void(*)>(USE_SAFE(mem, set, dest, reinterpret_cast<rsize_t>(destsz), ch, count))
 #else
-    return USE_SAFE(memset, dest, ch, count);
+    return USE_SAFE(mem, set, dest, ch, count);
 #endif
 }
 
@@ -66,29 +66,29 @@ template <typename... T>
 inline int interop_sprintf(char *buffer, size_t bufsz, const char *format, T... args)
 {
 #ifdef __STDC_LIB_EXT1__
-    return USE_SAFE(sprintf, buffer, reinterpret_cast<rsize_t>(bufsz), format, args...);
+    return USE_SAFE(sprint, f, buffer, reinterpret_cast<rsize_t>(bufsz), format, args...);
 #else
-    return USE_SAFE(sprintf, buffer, format, args...);
+    return USE_SAFE(sprint, f, buffer, format, args...);
 #endif
 }
 
 template <typename... T>
 inline int interop_snprintf(char *buffer, size_t bufsz, const char *format, T... args)
 {
-    return USE_SAFE(snprintf, buffer, bufsz, format, args...);
+    return USE_SAFE(snprint, f, buffer, bufsz, format, args...);
 }
 
 inline int interop_vsnprintf(char *buffer, size_t bufsz, const char *format, va_list vlist)
 {
-    return USE_SAFE(vsnprintf, buffer, bufsz, format, vlist);
+    return USE_SAFE(vsnprint, f, buffer, bufsz, format, vlist);
 }
 
 inline size_t interop_strlen(const char *str)
 {
 #ifdef __STDC_LIB_EXT1__
-    return USE_SAFE(strlen, str, sizeof(str) - 1);
+    return USE_SAFE(str, len, str, sizeof(str) - 1);
 #else
-    return USE_SAFE(strlen, str);
+    return USE_SAFE(str, len, str);
 #endif
 }
 
-- 
Gitee