From e256334fec4b27a1c745eed8c2422f0c70a62d95 Mon Sep 17 00:00:00 2001
From: lifansheng <lifansheng1@huawei.com>
Date: Tue, 7 Sep 2021 17:32:22 +0800
Subject: [PATCH] modify codecheck

Signed-off-by: lifansheng <lifansheng1@huawei.com>
---
 util/native_module_util.cpp | 66 +++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/util/native_module_util.cpp b/util/native_module_util.cpp
index 8d98e83..05fa468 100644
--- a/util/native_module_util.cpp
+++ b/util/native_module_util.cpp
@@ -84,12 +84,20 @@ namespace OHOS::Util {
         if (formatsize > 0) {
             format = new char[formatsize + 1];
             napi_get_value_string_utf8(env, argv[0], format, formatsize + 1, &formatsize);
+            std::string str = format;
+            delete []format;
+            delete []argv;
+            argv = nullptr;
+            format = nullptr;
+            return FormatString(str);
         }
-        std::string str = format;
-        delete []format;
-        delete []argv;
-        argv = nullptr;
-        format = nullptr;
+        napi_value res = nullptr;
+        NAPI_CALL(env, napi_get_undefined(env, &res));
+        return res;
+    }
+
+    static napi_value FormatString(std::string& str)
+    {
         std::string res;
         size_t strSize = str.size();
         for (size_t i = 0; i < strSize; ++i) {
@@ -144,29 +152,32 @@ namespace OHOS::Util {
         napi_get_value_string_utf8(env, argv[0], nullptr, 0, &formatsize);
         if (formatsize > 0) {
             format = new char[formatsize + 1];
-        }
-        napi_get_value_string_utf8(env, argv[0], format, formatsize + 1, &formatsize);
-        std::string printInfo;
-        std::vector<std::string> value;
-        for (size_t i = 1; i < argc; i++) {
-            char* valueString = nullptr;
-            size_t valuesize = 0;
-            napi_get_value_string_utf8(env, argv[i], nullptr, 0, &valuesize);
-            if (valuesize > 0) {
-                valueString = new char[valuesize + 1];
+            napi_get_value_string_utf8(env, argv[0], format, formatsize + 1, &formatsize);
+            std::string printInfo;
+            std::vector<std::string> value;
+            for (size_t i = 1; i < argc; i++) {
+                char* valueString = nullptr;
+                size_t valuesize = 0;
+                napi_get_value_string_utf8(env, argv[i], nullptr, 0, &valuesize);
+                if (valuesize > 0) {
+                    valueString = new char[valuesize + 1];
+                }
+                napi_get_value_string_utf8(env, argv[i], valueString, valuesize + 1, &valuesize);
+                value.push_back(valueString);
+                delete []valueString;
+                valueString = nullptr;
             }
-            napi_get_value_string_utf8(env, argv[i], valueString, valuesize + 1, &valuesize);
-            value.push_back(valueString);
-            delete []valueString;
-            valueString = nullptr;
+            printInfo = PrintfString(format, value);
+            napi_create_string_utf8(env, printInfo.c_str(), printInfo.size(), &result);
+            delete []format;
+            delete []argv;
+            argv = nullptr;
+            format = nullptr;
+            return result;
         }
-        printInfo = PrintfString(format, value);
-        napi_create_string_utf8(env, printInfo.c_str(), printInfo.size(), &result);
-        delete []format;
-        delete []argv;
-        argv = nullptr;
-        format = nullptr;
-        return result;
+        napi_value res = nullptr;
+        NAPI_CALL(env, napi_get_undefined(env, &res));
+        return res;
     }
 
     static napi_value GetErrorString(napi_env env, napi_callback_info info)
@@ -495,8 +506,7 @@ namespace OHOS::Util {
 
     // util module register
     extern "C"
-    __attribute__((constructor))
-    void RegisterModule()
+    __attribute__((constructor)) void RegisterModule()
     {
         napi_module_register(&utilModule);
     }
-- 
Gitee