Removed 572980 fix, added clang-formatting

Author: jackctj117

src/wh_client_nvm.c

@@ -651,7 +651,8 @@ int wh_Client_NvmReadResponse(whClientContext* c, int32_t *out_rc,
             (resp_size - hdr_len > WH_MESSAGE_NVM_MAX_READ_LEN)) {
             /* Invalid message */
             rc = WH_ERROR_ABORTED;
-        } else {
+        }
+        else {
             /* Valid message */
             if (out_rc != NULL) {
                 *out_rc = msg->rc;
@@ -729,7 +730,8 @@ int wh_Client_NvmAddObjectDmaResponse(whClientContext* c, int32_t* out_rc)
             (resp_size != sizeof(msg))) {
             /* Invalid message */
             rc = WH_ERROR_ABORTED;
-        } else {
+        }
+        else {
             /* Valid message */
             if (out_rc != NULL) {
                 *out_rc = msg.rc;
@@ -799,7 +801,8 @@ int wh_Client_NvmReadDmaResponse(whClientContext* c, int32_t* out_rc)
             (resp_size != sizeof(msg))) {
             /* Invalid message */
             rc = WH_ERROR_ABORTED;
-        } else {
+        }
+        else {
             /* Valid message */
             if (out_rc != NULL) {
                 *out_rc = msg.rc;

src/wh_nvm_flash.c

@@ -1193,7 +1193,8 @@ int wh_NvmFlash_DestroyObjects(void* c, whNvmId list_count,
             ret = nfObject_Copy(context, entry,
                     dest_part, &dest_object, &dest_data);
             if (ret != WH_ERROR_OK) {
-                /* Abort reclaim to avoid activating a partially copied partition */
+                /* Abort reclaim to avoid activating a partially copied
+                 * partition */
                 return ret;
             }
         }

src/wh_server_keystore.c

@@ -706,7 +706,8 @@ int wh_Server_HandleKeyRequest(whServerContext* server, uint16_t magic,
                 resp.ok = 0;
 
                 (void)wh_MessageKeystore_TranslateEvictResponse(
-                    magic, &resp, (whMessageKeystore_EvictResponse*)resp_packet);
+                    magic, &resp,
+                    (whMessageKeystore_EvictResponse*)resp_packet);
                 *out_resp_size = sizeof(resp);
             }
         } break;