commit ade2e0a3a339ae1c165cbe3bfe5171636ac798a7
author Xinyu Zhang <xinyu.zhang@arm.com> Thu Mar 18 16:20:54 2021 +0800
committer Ken Liu <ken.liu@arm.com> Wed Apr 28 07:51:28 2021 +0200
tree 21da67764faa0fd19d02e01a35b4d2a02729f9b2
parent e99f95f5a0b704ae5daac9a465f008889b4f9400

Unify to use ARRAY_SIZE in TF-M codes

ARRAY_SIZE(foo) is preferred over sizeof(foo)/sizeof(foo[0]).

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

interface/src/tfm_crypto_ipc_api.c

diff --git a/interface/src/tfm_crypto_ipc_api.c b/interface/src/tfm_crypto_ipc_api.c
index a89dd2b..b5f59c2 100644
--- a/interface/src/tfm_crypto_ipc_api.c
+++ b/interface/src/tfm_crypto_ipc_api.c
@@ -11,8 +11,6 @@
 #include "psa_manifest/sid.h"
 #include "psa/client.h"
 
-#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
-
 #define PSA_CONNECT(service)                                    \
     psa_handle_t ipc_handle;                                    \
     ipc_handle = psa_connect(service##_SID, service##_VERSION); \
@@ -24,12 +22,12 @@
 
 #define API_DISPATCH(sfn_name, sfn_id)                          \
     psa_call(ipc_handle, PSA_IPC_CALL,                          \
-        in_vec, ARRAY_SIZE(in_vec),                             \
-        out_vec, ARRAY_SIZE(out_vec))
+        in_vec, IOVEC_LEN(in_vec),                              \
+        out_vec, IOVEC_LEN(out_vec))
 
 #define API_DISPATCH_NO_OUTVEC(sfn_name, sfn_id)                \
     psa_call(ipc_handle, PSA_IPC_CALL,                          \
-        in_vec, ARRAY_SIZE(in_vec),                             \
+        in_vec, IOVEC_LEN(in_vec),                              \
         (psa_outvec *)NULL, 0)
 
 psa_status_t psa_crypto_init(void)
@@ -947,12 +945,12 @@
 
     PSA_CONNECT(TFM_CRYPTO);
 
-    size_t in_len = ARRAY_SIZE(in_vec);
+    size_t in_len = IOVEC_LEN(in_vec);
     if (additional_data == NULL) {
         in_len--;
     }
     status = psa_call(ipc_handle, PSA_IPC_CALL, in_vec, in_len,
-                      out_vec, ARRAY_SIZE(out_vec));
+                      out_vec, IOVEC_LEN(out_vec));
 
     *ciphertext_length = out_vec[0].len;
 
@@ -1008,12 +1006,12 @@
 
     PSA_CONNECT(TFM_CRYPTO);
 
-    size_t in_len = ARRAY_SIZE(in_vec);
+    size_t in_len = IOVEC_LEN(in_vec);
     if (additional_data == NULL) {
         in_len--;
     }
     status = psa_call(ipc_handle, PSA_IPC_CALL, in_vec, in_len,
-                      out_vec, ARRAY_SIZE(out_vec));
+                      out_vec, IOVEC_LEN(out_vec));
 
     *plaintext_length = out_vec[0].len;
 
@@ -1142,12 +1140,12 @@
 
     PSA_CONNECT(TFM_CRYPTO);
 
-    size_t in_len = ARRAY_SIZE(in_vec);
+    size_t in_len = IOVEC_LEN(in_vec);
     if (salt == NULL) {
         in_len--;
     }
     status = psa_call(ipc_handle, PSA_IPC_CALL, in_vec, in_len,
-                      out_vec, ARRAY_SIZE(out_vec));
+                      out_vec, IOVEC_LEN(out_vec));
 
     *output_length = out_vec[0].len;
 
@@ -1190,12 +1188,12 @@
 
     PSA_CONNECT(TFM_CRYPTO);
 
-    size_t in_len = ARRAY_SIZE(in_vec);
+    size_t in_len = IOVEC_LEN(in_vec);
     if (salt == NULL) {
         in_len--;
     }
     status = psa_call(ipc_handle, PSA_IPC_CALL, in_vec, in_len,
-                      out_vec, ARRAY_SIZE(out_vec));
+                      out_vec, IOVEC_LEN(out_vec));
 
     *output_length = out_vec[0].len;