diff --git a/unit_test/test_spdm_requester/challenge.c b/unit_test/test_spdm_requester/challenge.c
index a64276328d1..b59d04884f1 100644
--- a/unit_test/test_spdm_requester/challenge.c
+++ b/unit_test/test_spdm_requester/challenge.c
@@ -1245,10 +1245,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -3249,10 +3251,12 @@ static void req_challenge_case20(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/end_session.c b/unit_test/test_spdm_requester/end_session.c
index 47a4f69292e..fcb99e9a663 100644
--- a/unit_test/test_spdm_requester/end_session.c
+++ b/unit_test/test_spdm_requester/end_session.c
@@ -553,10 +553,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -1422,10 +1424,12 @@ static void req_end_session_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/error_test/get_capabilities_err.c b/unit_test/test_spdm_requester/error_test/get_capabilities_err.c
index f26ed230b56..09864f5ba03 100644
--- a/unit_test/test_spdm_requester/error_test/get_capabilities_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_capabilities_err.c
@@ -864,10 +864,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -1730,10 +1732,12 @@ static void libspdm_test_requester_get_capabilities_err_case29(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/error_test/get_digests_err.c b/unit_test/test_spdm_requester/error_test/get_digests_err.c
index 0428a0eebe3..cb228e82e15 100644
--- a/unit_test/test_spdm_requester/error_test/get_digests_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_digests_err.c
@@ -634,10 +634,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -1517,10 +1519,12 @@ static void libspdm_test_requester_get_digests_err_case22(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/error_test/get_measurements_err.c b/unit_test/test_spdm_requester/error_test/get_measurements_err.c
index 0b059d9041f..9a406fde76a 100644
--- a/unit_test/test_spdm_requester/error_test/get_measurements_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_measurements_err.c
@@ -2179,10 +2179,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -4349,10 +4351,12 @@ static void libspdm_test_requester_get_measurements_err_case33(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/error_test/get_version_err.c b/unit_test/test_spdm_requester/error_test/get_version_err.c
index 036e1448185..51c191195cf 100644
--- a/unit_test/test_spdm_requester/error_test/get_version_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_version_err.c
@@ -381,10 +381,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -781,10 +783,12 @@ static void libspdm_test_requester_get_version_err_case14(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/error_test/key_exchange_err.c b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
index 1867a290fab..afb70bb508f 100644
--- a/unit_test/test_spdm_requester/error_test/key_exchange_err.c
+++ b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
@@ -1172,10 +1172,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -5015,10 +5017,12 @@ static void libspdm_test_requester_key_exchange_err_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/finish.c b/unit_test/test_spdm_requester/finish.c
index b5627fc8d48..1cde15dae49 100644
--- a/unit_test/test_spdm_requester/finish.c
+++ b/unit_test/test_spdm_requester/finish.c
@@ -630,10 +630,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -2367,10 +2369,12 @@ static void req_finish_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/get_capabilities.c b/unit_test/test_spdm_requester/get_capabilities.c
index 702a0ac6afc..aeb367b4ce8 100644
--- a/unit_test/test_spdm_requester/get_capabilities.c
+++ b/unit_test/test_spdm_requester/get_capabilities.c
@@ -888,10 +888,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/get_certificate.c b/unit_test/test_spdm_requester/get_certificate.c
index 3672d9deb68..88a753ee125 100644
--- a/unit_test/test_spdm_requester/get_certificate.c
+++ b/unit_test/test_spdm_requester/get_certificate.c
@@ -1048,10 +1048,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -3311,10 +3313,12 @@ static void req_get_certificate_case16(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/get_digests.c b/unit_test/test_spdm_requester/get_digests.c
index 0eec4165037..841d247675a 100644
--- a/unit_test/test_spdm_requester/get_digests.c
+++ b/unit_test/test_spdm_requester/get_digests.c
@@ -706,10 +706,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/get_measurements.c b/unit_test/test_spdm_requester/get_measurements.c
index 63744a76b5f..894acb64d91 100644
--- a/unit_test/test_spdm_requester/get_measurements.c
+++ b/unit_test/test_spdm_requester/get_measurements.c
@@ -2421,10 +2421,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -5325,10 +5327,12 @@ static void req_get_measurements_case33(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/get_version.c b/unit_test/test_spdm_requester/get_version.c
index 868ab381f74..bd3cf4e24bd 100644
--- a/unit_test/test_spdm_requester/get_version.c
+++ b/unit_test/test_spdm_requester/get_version.c
@@ -403,10 +403,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/heartbeat.c b/unit_test/test_spdm_requester/heartbeat.c
index 80e0c21a39c..676e6ad50c2 100644
--- a/unit_test/test_spdm_requester/heartbeat.c
+++ b/unit_test/test_spdm_requester/heartbeat.c
@@ -553,10 +553,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -1432,10 +1434,12 @@ static void req_heartbeat_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/key_exchange.c b/unit_test/test_spdm_requester/key_exchange.c
index a6f9be33ab6..476a95f5c32 100644
--- a/unit_test/test_spdm_requester/key_exchange.c
+++ b/unit_test/test_spdm_requester/key_exchange.c
@@ -1198,10 +1198,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -5706,10 +5708,12 @@ static void req_key_exchange_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/psk_exchange.c b/unit_test/test_spdm_requester/psk_exchange.c
index 1bdf44264cb..d21eccc273a 100644
--- a/unit_test/test_spdm_requester/psk_exchange.c
+++ b/unit_test/test_spdm_requester/psk_exchange.c
@@ -939,10 +939,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -3439,10 +3441,12 @@ static void req_psk_exchange_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
diff --git a/unit_test/test_spdm_requester/psk_finish.c b/unit_test/test_spdm_requester/psk_finish.c
index c4679ab0af1..5432adec9df 100644
--- a/unit_test/test_spdm_requester/psk_finish.c
+++ b/unit_test/test_spdm_requester/psk_finish.c
@@ -607,10 +607,12 @@ static libspdm_return_t receive_message(
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }
@@ -1801,10 +1803,12 @@ static void req_psk_finish_case10(void **state) {
         if(error_code == SPDM_ERROR_CODE_BUSY) { /*busy is treated in cases 5 and 6*/
             error_code = SPDM_ERROR_CODE_UNEXPECTED_REQUEST;
         }
-        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) { /*skip some reserved error codes (0d to 3e)*/
+        /* skip some reserved error codes (0d to 3e) */
+        if(error_code == LIBSPDM_ERROR_CODE_RESERVED_0D) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_3F;
         }
-        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) { /*skip response not ready, request resync, and some reserved codes (44 to fc)*/
+        /* skip response not ready, request resync, and some reserved codes (44 to fc) */
+        if(error_code == SPDM_ERROR_CODE_RESPONSE_NOT_READY) {
             error_code = LIBSPDM_ERROR_CODE_RESERVED_FD;
         }
     }