commit 4e5d6c0991e29374455faf643436b843a33f0cb1
author Vincent Mailhol <mailhol.vincent@wanadoo.fr> Sun Nov 19 13:20:47 2023 +0900
committer Jérôme Forissier <jerome@forissier.org> Mon Nov 20 18:52:12 2023 +0100
tree 4a800ea829b635db9a566e5b74332c9e9d888899
parent c7391616cb442ab58914acf26122c09b5fc560c5

ta: os_test: do not print caller function name in EMSG()

EMSG() already prints the caller function name (and the line
number). As such, no need to hardcode it.

Remove all usage of caller function name in EMSG().

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Reviewed-by: Etienne Carriere <etienne.carriere@foss.st.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

ta/os_test/os_test.c

diff --git a/ta/os_test/os_test.c b/ta/os_test/os_test.c
index e34eab4..0f7aeb0 100644
--- a/ta/os_test/os_test.c
+++ b/ta/os_test/os_test.c
@@ -534,7 +534,7 @@
 	res = TEE_OpenTASession(&test_uuid, TEE_TIMEOUT_INFINITE, 0, NULL,
 				&sess, &ret_orig);
 	if (res != TEE_SUCCESS) {
-		EMSG("test_mem_access_right: TEE_OpenTASession failed\n");
+		EMSG("TEE_OpenTASession failed\n");
 		goto cleanup_return;
 	}
 
@@ -548,7 +548,7 @@
 				  TA_OS_TEST_CMD_PARAMS_ACCESS,
 				  l_pts, l_params, &ret_orig);
 	if (res != TEE_SUCCESS) {
-		EMSG("test_mem_access_right: TEE_InvokeTACommand failed\n");
+		EMSG("TEE_InvokeTACommand failed\n");
 		goto cleanup_return;
 	}
 
@@ -884,15 +884,14 @@
 					   TEE_PARAM_TYPE_NONE,
 					   TEE_PARAM_TYPE_NONE,
 					   TEE_PARAM_TYPE_NONE)) {
-		EMSG("ta_entry_client_with_timeout: bad parameters\n");
+		EMSG("bad parameters\n");
 		return TEE_ERROR_BAD_PARAMETERS;
 	}
 
 	res = TEE_OpenTASession(&os_test_uuid, TEE_TIMEOUT_INFINITE, 0, NULL,
 				&sess, &ret_orig);
 	if (res != TEE_SUCCESS) {
-		EMSG(
-		"ta_entry_client_with_timeout: TEE_OpenTASession failed\n");
+		EMSG("TEE_OpenTASession failed\n");
 		return res;
 	}
 
@@ -902,9 +901,8 @@
 				&ret_orig);
 
 	if (ret_orig != TEE_ORIGIN_TRUSTED_APP || res != TEE_ERROR_CANCEL) {
-		EMSG("ta_entry_client_with_timeout: TEE_InvokeTACommand: "
-		     "res 0x%x ret_orig 0x%x\n", (unsigned int)res,
-		     (unsigned int)ret_orig);
+		EMSG("TEE_InvokeTACommand: res 0x%x ret_orig 0x%x\n",
+		     (unsigned int)res, (unsigned int)ret_orig);
 		res = TEE_ERROR_GENERIC;
 	} else
 		res = TEE_SUCCESS;
@@ -945,7 +943,7 @@
 	res = TEE_OpenTASession(&crypt_uuid, TEE_TIMEOUT_INFINITE, 0, NULL,
 				&sess, &ret_orig);
 	if (res != TEE_SUCCESS) {
-		EMSG("ta_entry_client: TEE_OpenTASession failed\n");
+		EMSG("TEE_OpenTASession failed\n");
 		goto cleanup_return;
 	}
 
@@ -960,12 +958,12 @@
 				  TA_CRYPT_CMD_SHA256, l_pts, l_params,
 				  &ret_orig);
 	if (res != TEE_SUCCESS) {
-		EMSG("ta_entry_client: TEE_InvokeTACommand failed\n");
+		EMSG("TEE_InvokeTACommand failed\n");
 		goto cleanup_return;
 	}
 
 	if (TEE_MemCompare(sha256_out, out, sizeof(sha256_out)) != 0) {
-		EMSG("ta_entry_client: out parameter failed\n");
+		EMSG("out parameter failed\n");
 		res = TEE_ERROR_GENERIC;
 		goto cleanup_return;
 	}