diff --git a/interop/src/cpp/DeserializerBase.h b/interop/src/cpp/DeserializerBase.h index 560ecbb47cc02551578a6bdc60bfa0cf3eba9de1..219dcfbe274ab7e2b5adce118c5297f315605455 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/common-interop.cc b/interop/src/cpp/common-interop.cc index 0b9699d9383602354f51e1d98ae1ed28b8bdf0fc..7c4008643b0b9b4fbf0627735038ad3e1eb944fd 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 c3ec47ce97a17a4acd4173e4a1eadd2cf21bb349..3790312f0854996f9b366f84155db57a7427974e 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,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 ""; } diff --git a/interop/src/cpp/interop-types.h b/interop/src/cpp/interop-types.h index ff0f53b4f2d4111d9ead0ea5d0b98f1f26936597..b27e3dc18e080fb3032d93cdcbf9ca05e05746f3 100644 --- a/interop/src/cpp/interop-types.h +++ b/interop/src/cpp/interop-types.h @@ -3,7 +3,7 @@ #include -#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 {