Change PSA_CRYPTO_ACCESS_CONTROL_RESET into static inline function

itayzafrir · itayzafrir · commit 99032f6967e8 · 2019-02-24T15:07:54.000+02:00
diff --git a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.c b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.c
@@ -28,16 +28,19 @@ typedef struct psa_crypto_access_control_s {
 
 static psa_crypto_access_control_t crypto_access_control_arr[PSA_KEY_SLOT_COUNT];
 
-#define PSA_CRYPTO_ACCESS_CONTROL_RESET() (memset(crypto_access_control_arr, 0, sizeof(crypto_access_control_arr)))
+static inline void psa_crypto_access_control_reset()
+{
+    memset(crypto_access_control_arr, 0, sizeof(crypto_access_control_arr));
+}
 
 void psa_crypto_access_control_init(void)
 {
-    PSA_CRYPTO_ACCESS_CONTROL_RESET();
+    psa_crypto_access_control_reset();
 }
 
 void psa_crypto_access_control_destroy(void)
 {
-    PSA_CRYPTO_ACCESS_CONTROL_RESET();
+    psa_crypto_access_control_reset();
 }
 
 void psa_crypto_access_control_register_handle(psa_key_handle_t key_handle, int32_t partition_id)

Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,19 @@ typedef struct psa_crypto_access_control_s {`
`28`	`28`
`29`	`29`	`static psa_crypto_access_control_t crypto_access_control_arr[PSA_KEY_SLOT_COUNT];`
`30`	`30`
`31`		`-#define PSA_CRYPTO_ACCESS_CONTROL_RESET() (memset(crypto_access_control_arr, 0, sizeof(crypto_access_control_arr)))`
	`31`	`+static inline void psa_crypto_access_control_reset()`
	`32`	`+{`
	`33`	`+ memset(crypto_access_control_arr, 0, sizeof(crypto_access_control_arr));`
	`34`	`+}`
`32`	`35`
`33`	`36`	`void psa_crypto_access_control_init(void)`
`34`	`37`	`{`
`35`		`- PSA_CRYPTO_ACCESS_CONTROL_RESET();`
	`38`	`+ psa_crypto_access_control_reset();`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`void psa_crypto_access_control_destroy(void)`
`39`	`42`	`{`
`40`		`- PSA_CRYPTO_ACCESS_CONTROL_RESET();`
	`43`	`+ psa_crypto_access_control_reset();`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`void psa_crypto_access_control_register_handle(psa_key_handle_t key_handle, int32_t partition_id)`