From f2d8180ee9a7bc07caf36877b8bffcaa1f461010 Mon Sep 17 00:00:00 2001
From: Korobeinikov Evgeny <korobeinikov.evgeny@huawei.com>
Date: Wed, 5 Feb 2025 20:26:05 +0300
Subject: [PATCH 1/2] Resolve more warnings

---
 interop/src/cpp/common-interop.cc     | 8 --------
 interop/src/cpp/ets/convertors-ets.cc | 4 +---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/interop/src/cpp/common-interop.cc b/interop/src/cpp/common-interop.cc
index 0b9699d93..7c4008643 100644
--- a/interop/src/cpp/common-interop.cc
+++ b/interop/src/cpp/common-interop.cc
@@ -338,10 +338,6 @@ KOALA_INTEROP_V2(CallCallbackResourceReleaser, KNativePointer, KInt)
 #define __QUOTE(x) #x
 #define QUOTE(x) __QUOTE(x)
 
-#ifndef INTEROP_LIBRARY_NAME
-#error "INTEROP_LIBRARY_NAME must be defined"
-#endif
-
 void impl_NativeLog(const KStringPtr& str) {
 #ifdef KOALA_OHOS
     LOGI("%{public}s: %{public}s", QUOTE(INTEROP_LIBRARY_NAME), str.c_str());
@@ -387,10 +383,6 @@ void resolveDeferredImpl(napi_env env, napi_value js_callback, KVMDeferred* defe
 }
 #endif
 
-static void releaseDeferred(KVMDeferred* deferred) {
-    delete deferred;
-}
-
 KVMDeferred* CreateDeferred(KVMContext vmContext, KVMObjectHandle* promiseHandle) {
     KVMDeferred* deferred = new KVMDeferred();
     deferred->resolve = resolveDeferred;
diff --git a/interop/src/cpp/ets/convertors-ets.cc b/interop/src/cpp/ets/convertors-ets.cc
index c3ec47ce9..aac29a591 100644
--- a/interop/src/cpp/ets/convertors-ets.cc
+++ b/interop/src/cpp/ets/convertors-ets.cc
@@ -19,12 +19,10 @@
 #include "interop-logging.h"
 #include "interop-types.h"
 
-static const char* nativeModule = "@koalaui/arkts-arkui/generated/arkts/NativeModuleLoader/NativeModuleLoader";
 static const char* callCallbackFromNative = "callCallbackFromNative";
 static const char* callCallbackFromNativeSig = "I[BI:I";
 
 static const char* FAST_NATIVE_PREFIX = "#F$";
-static const char* CRITICAL_NATIVE_PREFIX = "#C$";
 
 const bool registerByOne = true;
 
@@ -148,5 +146,5 @@ const std::string& EtsExports::getClasspath(const std::string& module) {
         return defaultClasspath->second;
     }
     INTEROP_FATAL("Classpath for module %s was not registered", module.c_str());
-    return "";
+    return std::string("");
 }
-- 
Gitee


From cd6bdf650c1f27da5bca5114c0a086d8c2b12b57 Mon Sep 17 00:00:00 2001
From: Korobeinikov Evgeny <korobeinikov.evgeny@huawei.com>
Date: Wed, 5 Feb 2025 21:00:25 +0300
Subject: [PATCH 2/2] Resolve more errors 2

---
 interop/src/cpp/DeserializerBase.h    | 2 --
 interop/src/cpp/ets/convertors-ets.cc | 1 -
 interop/src/cpp/interop-types.h       | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/interop/src/cpp/DeserializerBase.h b/interop/src/cpp/DeserializerBase.h
index 560ecbb47..219dcfbe2 100644
--- a/interop/src/cpp/DeserializerBase.h
+++ b/interop/src/cpp/DeserializerBase.h
@@ -51,7 +51,6 @@ inline const char *tagName(InteropTag tag)
     return "OBJECT";
   }
   INTEROP_FATAL("Fatal error");
-  return nullptr;
 }
 
 inline const char *tagNameExact(InteropTag tag)
@@ -74,7 +73,6 @@ inline const char *tagNameExact(InteropTag tag)
     return "INTEROP_TAG_OBJECT";
   }
   INTEROP_FATAL("Fatal error");
-  return nullptr;
 }
 
 inline InteropFunction makeArkFunctionFromId(InteropInt32 id) {
diff --git a/interop/src/cpp/ets/convertors-ets.cc b/interop/src/cpp/ets/convertors-ets.cc
index aac29a591..3790312f0 100644
--- a/interop/src/cpp/ets/convertors-ets.cc
+++ b/interop/src/cpp/ets/convertors-ets.cc
@@ -146,5 +146,4 @@ const std::string& EtsExports::getClasspath(const std::string& module) {
         return defaultClasspath->second;
     }
     INTEROP_FATAL("Classpath for module %s was not registered", module.c_str());
-    return std::string("");
 }
diff --git a/interop/src/cpp/interop-types.h b/interop/src/cpp/interop-types.h
index ff0f53b4f..b27e3dc18 100644
--- a/interop/src/cpp/interop-types.h
+++ b/interop/src/cpp/interop-types.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#define INTEROP_FATAL(msg, ...) fprintf(stderr, msg "\n", ##__VA_ARGS__); assert(false);
+#define INTEROP_FATAL(msg, ...) fprintf(stderr, msg "\n", ##__VA_ARGS__); abort();
 
 typedef enum InteropTag
 {
-- 
Gitee