From 8ab888d11b0bf94f8f596495c8c67e2e39897ccb Mon Sep 17 00:00:00 2001
From: zhaolihui <zhaolihui2@huawei.com>
Date: Thu, 10 Mar 2022 17:09:53 +0800
Subject: [PATCH] code review file permission and specification fix

Signed-off-by: zhaolihui <zhaolihui2@huawei.com>
---
 LICENSE                                             |   0
 OAT.xml                                             |   5 +----
 README_zh.md                                        |   0
 bin/config/bytrace.cfg                              |   0
 bin/config/bytrace.rc                               |   0
 bin/include/bytrace_capture.h                       |   0
 bin/src/bytrace.cpp                                 |   6 +++---
 bin/src/bytrace_capture.cpp                         |   0
 bin/src/bytrace_impl.cpp                            |   1 +
 bin/test/BUILD.gn                                   |   0
 .../unittest/common/native/bytrace_ndk_test.cpp     |   0
 bytrace.gni                                         |   0
 figures/20210422-202314(WeLinkPC).png               | Bin
 interfaces/innerkits/BUILD.gn                       |   0
 interfaces/innerkits/native/BUILD.gn                |   0
 interfaces/innerkits/native/include/bytrace.h       |   0
 interfaces/kits/js/@ohos.bytrace.d.ts               |   0
 interfaces/kits/js/napi/declare_napi.h              |   4 ++--
 script/bytrace_capture.bat                          |   0
 script/bytrace_multi.py                             |   6 +++---
 20 files changed, 10 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 LICENSE
 mode change 100755 => 100644 README_zh.md
 mode change 100755 => 100644 bin/config/bytrace.cfg
 mode change 100755 => 100644 bin/config/bytrace.rc
 mode change 100755 => 100644 bin/include/bytrace_capture.h
 mode change 100755 => 100644 bin/src/bytrace.cpp
 mode change 100755 => 100644 bin/src/bytrace_capture.cpp
 mode change 100755 => 100644 bin/src/bytrace_impl.cpp
 mode change 100755 => 100644 bin/test/BUILD.gn
 mode change 100755 => 100644 bin/test/unittest/common/native/bytrace_ndk_test.cpp
 mode change 100755 => 100644 bytrace.gni
 mode change 100755 => 100644 figures/20210422-202314(WeLinkPC).png
 mode change 100755 => 100644 interfaces/innerkits/BUILD.gn
 mode change 100755 => 100644 interfaces/innerkits/native/BUILD.gn
 mode change 100755 => 100644 interfaces/innerkits/native/include/bytrace.h
 mode change 100755 => 100644 interfaces/kits/js/@ohos.bytrace.d.ts
 mode change 100755 => 100644 script/bytrace_capture.bat
 mode change 100755 => 100644 script/bytrace_multi.py

diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/OAT.xml b/OAT.xml
index 0e0eaee..3a86653 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -12,9 +12,6 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-     
-     Notes:
-     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun@huawei.com.   
 --> 
 <!-- OAT(OSS Audit Tool) configuration guide:
 basedir: Root dir, the basedir + project path is the real source file location.
@@ -62,4 +59,4 @@ Note:If the text contains special characters, please escape them according to th
             </filefilter>
         </filefilterlist>
     </oatconfig>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/README_zh.md b/README_zh.md
old mode 100755
new mode 100644
diff --git a/bin/config/bytrace.cfg b/bin/config/bytrace.cfg
old mode 100755
new mode 100644
diff --git a/bin/config/bytrace.rc b/bin/config/bytrace.rc
old mode 100755
new mode 100644
diff --git a/bin/include/bytrace_capture.h b/bin/include/bytrace_capture.h
old mode 100755
new mode 100644
diff --git a/bin/src/bytrace.cpp b/bin/src/bytrace.cpp
old mode 100755
new mode 100644
index 62d5dc9..8627671
--- a/bin/src/bytrace.cpp
+++ b/bin/src/bytrace.cpp
@@ -420,7 +420,7 @@ static void ParseLongOpt(const string& cmd, int optionIndex, bool& isTrue)
         struct stat buf;
         size_t len = strnlen(optarg, MAX_OUTPUT_LEN);
         if (len == MAX_OUTPUT_LEN || len < 1 ||
-            (stat(optarg, &buf) == 0 && (buf.st_mode & S_IFDIR) != 0)) {
+            (stat(optarg, &buf) == 0 && (buf.st_mode & S_IFDIR))) {
             fprintf(stderr, "Error: output file is illegal\n");
             isTrue = false;
         } else {
@@ -480,7 +480,7 @@ static bool ParseOpt(int opt, char** argv, int optIndex)
             struct stat buf;
             size_t len = strnlen(optarg, MAX_OUTPUT_LEN);
             if (len == MAX_OUTPUT_LEN || len < 1 ||
-                (stat(optarg, &buf) == 0 && (buf.st_mode & S_IFDIR) != 0)) {
+                (stat(optarg, &buf) == 0 && (buf.st_mode & S_IFDIR))) {
                 fprintf(stderr, "Error: output file is illegal\n");
                 isTrue = false;
             } else {
@@ -844,7 +844,7 @@ static void InitAllSupportTags()
     g_tagMap["ark"] = { "ark", "ARK Module", BYTRACE_TAG_ARK, USER, {}};
     g_tagMap["window"] = { "window", "Window Manager", BYTRACE_TAG_WINDOW_MANAGER, USER, {}};
     g_tagMap["app"] = { "app", "APP Module", BYTRACE_TAG_APP, USER, {}};
-    g_tagMap["zbinder"] = { "zbinder", "Harmony binder communication", 0, KERNEL, {
+    g_tagMap["zbinder"] = { "zbinder", "OpenHarmony binder communication", 0, KERNEL, {
         { "events/zbinder/enable" },
     }};
 
diff --git a/bin/src/bytrace_capture.cpp b/bin/src/bytrace_capture.cpp
old mode 100755
new mode 100644
diff --git a/bin/src/bytrace_impl.cpp b/bin/src/bytrace_impl.cpp
old mode 100755
new mode 100644
index 6bc69a6..da9c2f4
--- a/bin/src/bytrace_impl.cpp
+++ b/bin/src/bytrace_impl.cpp
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
 #include <cinttypes>
 #include <climits>
diff --git a/bin/test/BUILD.gn b/bin/test/BUILD.gn
old mode 100755
new mode 100644
diff --git a/bin/test/unittest/common/native/bytrace_ndk_test.cpp b/bin/test/unittest/common/native/bytrace_ndk_test.cpp
old mode 100755
new mode 100644
diff --git a/bytrace.gni b/bytrace.gni
old mode 100755
new mode 100644
diff --git a/figures/20210422-202314(WeLinkPC).png b/figures/20210422-202314(WeLinkPC).png
old mode 100755
new mode 100644
diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn
old mode 100755
new mode 100644
diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn
old mode 100755
new mode 100644
diff --git a/interfaces/innerkits/native/include/bytrace.h b/interfaces/innerkits/native/include/bytrace.h
old mode 100755
new mode 100644
diff --git a/interfaces/kits/js/@ohos.bytrace.d.ts b/interfaces/kits/js/@ohos.bytrace.d.ts
old mode 100755
new mode 100644
diff --git a/interfaces/kits/js/napi/declare_napi.h b/interfaces/kits/js/napi/declare_napi.h
index d1f83ae..50d4e85 100644
--- a/interfaces/kits/js/napi/declare_napi.h
+++ b/interfaces/kits/js/napi/declare_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -23,4 +23,4 @@ EXTERN_C_START
 napi_value BytraceInit(napi_env env, napi_value exports);
 EXTERN_C_END
 
-#endif // DEVELOPTOOLS_INTERFACES_KITS_DECLARE_NAPI_H
\ No newline at end of file
+#endif // DEVELOPTOOLS_INTERFACES_KITS_DECLARE_NAPI_H
diff --git a/script/bytrace_capture.bat b/script/bytrace_capture.bat
old mode 100755
new mode 100644
diff --git a/script/bytrace_multi.py b/script/bytrace_multi.py
old mode 100755
new mode 100644
index 3518fb0..17167ad
--- a/script/bytrace_multi.py
+++ b/script/bytrace_multi.py
@@ -39,8 +39,8 @@ def read_files(file, devices_name):
                 if trace_match:
                     traces.append((float(trace_match.group(5)), line))
                 if line.find("realtime_ts") > -1:
-                    time_regex = trace_regex + \
-                        "tracing_mark_write:\s+trace_event_clock_sync: realtime_ts=(.*)"
+                    time_regex = "{}{}".format(trace_regex, \
+                        "tracing_mark_write:\s+trace_event_clock_sync: realtime_ts=(.*)")
                     time_match = re.match(time_regex, line)
                     all_real_time_dict[devices_name] = { \
                         "realtime_ts": int(time_match.group(6)), \
@@ -130,7 +130,7 @@ def main():
     # Sort by timestamp from small to large
     all_trace_sorted_list = sorted(all_trace_list, key=lambda x: x[0])
     curtime = time.strftime("%Y%m%d_%H%M%S", time.localtime())
-    write_to_file(all_trace_sorted_list, "multi_trace_"+str(curtime)+".ftrace")
+    write_to_file(all_trace_sorted_list, "multi_trace_{}.ftrace".format(str(curtime)))
 
 if __name__ == '__main__':
     main()