diff --git a/interop/src/cpp/interop-logging.h b/interop/src/cpp/interop-logging.h index 95ab53092fdb639b0b98652627d950fcbb20da51..8a893a3edf0d883f5d52bbaf2a1d51df66d72c41 100644 --- a/interop/src/cpp/interop-logging.h +++ b/interop/src/cpp/interop-logging.h @@ -23,13 +23,11 @@ #define LOG(msg) OH_SK_LOG_INFO(msg); #define LOGI(msg, ...) OH_SK_LOG_INFO_A(msg, ##__VA_ARGS__); #define LOGE(msg, ...) OH_SK_LOG_ERROR_A(msg, ##__VA_ARGS__); -#define LOGE0(msg) OH_SK_LOG_ERROR(msg); #define LOG_PUBLIC "{public}" #else #define LOG(msg) fprintf(stdout, msg "\n"); #define LOGI(msg, ...) fprintf(stdout, msg "\n", ##__VA_ARGS__); #define LOGE(msg, ...) fprintf(stderr, msg "\n", ##__VA_ARGS__); -#define LOGE0(msg) fprintf(stderr, msg "\n"); #define LOG_PUBLIC "" #endif diff --git a/interop/src/cpp/ohos/oh_sk_log.h b/interop/src/cpp/ohos/oh_sk_log.h index 7e2a1919be61e159455b2c8044f72d9472ea6fcd..dd133ce4e65117c5c908f64df4e5cb01dddc40e2 100644 --- a/interop/src/cpp/ohos/oh_sk_log.h +++ b/interop/src/cpp/ohos/oh_sk_log.h @@ -31,27 +31,27 @@ const char* oh_sk_log_type_str(oh_sk_log_type type); #ifdef OH_SK_LOG_TO_FILE #define OH_SK_LOG_INFO(msg) oh_sk_file_log(oh_sk_log_type::Log_Info, msg) -#define OH_SK_LOG_INFO_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Info, msg, __VA_ARGS__) +#define OH_SK_LOG_INFO_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Info, msg, ##__VA_ARGS__) #define OH_SK_LOG_ERROR(msg) oh_sk_file_log(oh_sk_log_type::Log_Error, msg) -#define OH_SK_LOG_ERROR_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Error, msg, __VA_ARGS__) +#define OH_SK_LOG_ERROR_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Error, msg, ##__VA_ARGS__) #define OH_SK_LOG_DEBUG(msg) oh_sk_file_log(oh_sk_log_type::Log_Debug, msg) -#define OH_SK_LOG_DEBUG_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Debug, msg, __VA_ARGS__) +#define OH_SK_LOG_DEBUG_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Debug, msg, ##__VA_ARGS__) #define OH_SK_LOG_WARN(msg) oh_sk_file_log(oh_sk_log_type::Log_Warn, msg) -#define OH_SK_LOG_WARN_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Warn, msg, __VA_ARGS__) +#define OH_SK_LOG_WARN_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Warn, msg, ##__VA_ARGS__) #define OH_SK_LOG_FATAL(msg) oh_sk_file_log(oh_sk_log_type::Log_Fatal, msg) -#define OH_SK_LOG_FATAL_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Fatal, msg, __VA_ARGS__) +#define OH_SK_LOG_FATAL_A(msg, ...) oh_sk_file_log(oh_sk_log_type::Log_Fatal, msg, ##__VA_ARGS__) #else #define OH_SK_LOG_INFO(msg) OH_LOG_Print(LOG_APP, LOG_INFO, 0xFF00, "Koala", msg) -#define OH_SK_LOG_INFO_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_INFO, 0xFF00, "Koala", msg, __VA_ARGS__) +#define OH_SK_LOG_INFO_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_INFO, 0xFF00, "Koala", msg, ##__VA_ARGS__) #define OH_SK_LOG_ERROR(msg) OH_LOG_Print(LOG_APP, LOG_ERROR, 0xFF00, "Koala", msg) -#define OH_SK_LOG_ERROR_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_ERROR, 0xFF00, "Koala", msg, __VA_ARGS__) +#define OH_SK_LOG_ERROR_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_ERROR, 0xFF00, "Koala", msg, ##__VA_ARGS__) #define OH_SK_LOG_DEBUG(msg) OH_LOG_Print(LOG_APP, LOG_DEBUG, 0xFF00, "Koala", msg) -#define OH_SK_LOG_DEBUG_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_DEBUG, 0xFF00, "Koala", msg, __VA_ARGS__) +#define OH_SK_LOG_DEBUG_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_DEBUG, 0xFF00, "Koala", msg, ##__VA_ARGS__) #define OH_SK_LOG_WARN(msg) OH_LOG_Print(LOG_APP, LOG_WARN, 0xFF00, "Koala", msg) -#define OH_SK_LOG_WARN_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_WARN, 0xFF00, "Koala", msg, __VA_ARGS__) +#define OH_SK_LOG_WARN_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_WARN, 0xFF00, "Koala", msg, ##__VA_ARGS__) #define OH_SK_LOG_FATAL(msg) OH_LOG_Print(LOG_APP, LOG_FATAL, 0xFF00, "Koala", msg) -#define OH_SK_LOG_FATAL_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_FATAL, 0xFF00, "Koala", msg, __VA_ARGS__) +#define OH_SK_LOG_FATAL_A(msg, ...) OH_LOG_Print(LOG_APP, LOG_FATAL, 0xFF00, "Koala", msg, ##__VA_ARGS__) #endif diff --git a/interop/src/cpp/vmloader.cc b/interop/src/cpp/vmloader.cc index 5a13ab166da22fd98618a14ec076789ffe647284..4bec3c85f36d15d95abf3717a9cf809d5474b65a 100644 --- a/interop/src/cpp/vmloader.cc +++ b/interop/src/cpp/vmloader.cc @@ -397,7 +397,7 @@ extern "C" DLL_EXPORT KNativePointer StartApplication(const char* appUrl, const #endif auto app = etsEnv->NewGlobalRef(etsEnv->CallStaticObjectMethod(appClass, create, etsEnv->NewStringUTF(appUrl), etsEnv->NewStringUTF(appParams), useNativeLog)); if (!app) { - LOGE0("createApplication returned null"); + LOGE("createApplication returned null"); if (etsEnv->ErrorCheck()) { etsEnv->ErrorDescribe(); etsEnv->ErrorClear(); @@ -452,7 +452,7 @@ extern "C" DLL_EXPORT KBoolean RunApplication(const KInt arg0, const KInt arg1) if (g_vmEntry.vmKind == PANDA_VM_KIND) { EtsEnv* etsEnv = (EtsEnv*)(g_vmEntry.env); if (!g_vmEntry.enter) { - LOGE0("Cannot find enter method"); + LOGE("Cannot find enter method"); return -1; } auto result = etsEnv->CallBooleanMethod( @@ -462,7 +462,7 @@ extern "C" DLL_EXPORT KBoolean RunApplication(const KInt arg0, const KInt arg1) (ets_int)arg1 ); if (etsEnv->ErrorCheck()) { - LOGE0("Calling enter() method gave an error"); + LOGE("Calling enter() method gave an error"); etsEnv->ErrorDescribe(); etsEnv->ErrorClear(); } @@ -477,7 +477,7 @@ extern "C" DLL_EXPORT void EmitEvent(const KInt type, const KInt target, const K if (g_vmEntry.vmKind == JAVA_VM_KIND) { JNIEnv* jEnv = (JNIEnv*)(g_vmEntry.env); if (!g_vmEntry.emitEvent) { - LOGE0("Cannot find emitEvent method"); + LOGE("Cannot find emitEvent method"); return; } jEnv->CallVoidMethod( @@ -498,7 +498,7 @@ extern "C" DLL_EXPORT void EmitEvent(const KInt type, const KInt target, const K if (g_vmEntry.vmKind == PANDA_VM_KIND) { EtsEnv* etsEnv = (EtsEnv*)(g_vmEntry.env); if (!g_vmEntry.emitEvent) { - LOGE0("Cannot find emitEvent method"); + LOGE("Cannot find emitEvent method"); return; } etsEnv->CallVoidMethod( @@ -510,7 +510,7 @@ extern "C" DLL_EXPORT void EmitEvent(const KInt type, const KInt target, const K (ets_int)arg1 ); if (etsEnv->ErrorCheck()) { - LOGE0("Calling emitEvent() method gave an error"); + LOGE("Calling emitEvent() method gave an error"); etsEnv->ErrorDescribe(); etsEnv->ErrorClear(); }