commit f984f3a34ac63720d4490bc771f066e1aeed6ef3
author Xinyu Zhang <xinyu.zhang@arm.com> Tue Jan 31 14:33:13 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Tue Jan 31 14:36:54 2023 +0800
tree 065115b624d3b58188b99a7947810665a9507e5c
parent 66e119aaece63926736375aadca0a3881bd03de7

NSID: Fix build warning in nsid_testsuite.c

Add parentheses and update code format to fix build warning:
"suggest parentheses around '+' in operand of '&'".

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ic19125e6b8e98ffacfb83aac6b0589182665ac6d

test/secure_fw/suites/nsid/nsid_testsuite.c

diff --git a/test/secure_fw/suites/nsid/nsid_testsuite.c b/test/secure_fw/suites/nsid/nsid_testsuite.c
index 2137d28..c35890f 100755
--- a/test/secure_fw/suites/nsid/nsid_testsuite.c
+++ b/test/secure_fw/suites/nsid/nsid_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -204,12 +204,8 @@
     token_a = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id);
     token_b = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id + 1);
 
-    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX) || \
-        token_b != MAKE_NS_CLIENT_TOKEN(thread_id + 1, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX)) {
+    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, VALID_GROUP_ID, VALID_INDEX) ||
+        token_b != MAKE_NS_CLIENT_TOKEN((thread_id + 1), VALID_GROUP_ID, VALID_INDEX)) {
         TEST_FAIL("ACQUIRE shall return a valid token\r\n");
         nsid_test_case_finish(ret);
         return;
@@ -267,12 +263,8 @@
     token_a = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id);
     token_b = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id + 1);
 
-    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, \
-                                        VALID_GROUP_ID,
-                                        VALID_INDEX) || \
-        token_b != MAKE_NS_CLIENT_TOKEN(thread_id + 1, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX)) {
+    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, VALID_GROUP_ID, VALID_INDEX) ||
+        token_b != MAKE_NS_CLIENT_TOKEN((thread_id + 1), VALID_GROUP_ID, VALID_INDEX)) {
         TEST_FAIL("ACQUIRE shall return a valid token\r\n");
         nsid_test_case_finish(ret);
         return;
@@ -466,12 +458,8 @@
     token_a = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id);
     token_b = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id + 1);
 
-    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX) || \
-        token_b != MAKE_NS_CLIENT_TOKEN(thread_id + 1, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX)) {
+    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, VALID_GROUP_ID, VALID_INDEX) ||
+        token_b != MAKE_NS_CLIENT_TOKEN((thread_id + 1), VALID_GROUP_ID, VALID_INDEX)) {
         TEST_FAIL("ACQUIRE shall return a valid token\r\n");
         nsid_test_case_finish(ret);
         return;
@@ -894,12 +882,8 @@
     token_a = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id);
     token_b = nsid_acquire_ctx_svc(VALID_GROUP_ID, thread_id + 1);
 
-    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX) || \
-        token_b != MAKE_NS_CLIENT_TOKEN(thread_id + 1, \
-                                        VALID_GROUP_ID, \
-                                        VALID_INDEX)) {
+    if (token_a != MAKE_NS_CLIENT_TOKEN(thread_id, VALID_GROUP_ID, VALID_INDEX) ||
+        token_b != MAKE_NS_CLIENT_TOKEN((thread_id + 1), VALID_GROUP_ID, VALID_INDEX)) {
         TEST_FAIL("ACQUIRE shall return a valid token\r\n");
         nsid_test_case_finish(ret);
         return;