widetree: fix clang-format error

Author: rizlik

src/wh_nvm.c

@@ -192,7 +192,7 @@ int wh_Nvm_DestroyObjects(whNvmContext* context, whNvmId list_count,
 
 
 int wh_Nvm_Read(whNvmContext* context, whNvmId id, whNvmSize offset,
-        whNvmSize data_len, uint8_t* data)
+                whNvmSize data_len, uint8_t* data)
 {
     if (    (context == NULL) ||
             (context->cb == NULL) ) {

src/wh_nvm_flash.c

@@ -133,8 +133,8 @@ static int nfObject_Program(whNvmFlashContext* context, int partition,
         int object_index, uint32_t epoch, whNvmMetadata* meta, uint32_t start,
         const uint8_t* data);
 static int nfObject_ReadDataBytes(whNvmFlashContext* context, int partition,
-        int object_index, uint32_t byte_offset, uint32_t byte_count,
-        uint8_t* out_data);
+                                  int object_index, uint32_t byte_offset,
+                                  uint32_t byte_count, uint8_t* out_data);
 static int nfObject_Copy(whNvmFlashContext* context, int object_index,
         int partition, uint32_t *inout_next_object, uint32_t *inout_next_data);
 
@@ -651,8 +651,8 @@ static int nfObject_Program(whNvmFlashContext* context, int partition,
 }
 
 static int nfObject_ReadDataBytes(whNvmFlashContext* context, int partition,
-        int object_index,
-        uint32_t byte_offset, uint32_t byte_count, uint8_t* out_data)
+                                  int object_index, uint32_t byte_offset,
+                                  uint32_t byte_count, uint8_t* out_data)
 {
     int start = 0;
     uint32_t startOffset = 0;
@@ -675,18 +675,16 @@ static int nfObject_ReadDataBytes(whNvmFlashContext* context, int partition,
     }
 
     /* Ensure we don't read off the end of the active partition */
-    if (WH_ERROR_OK != nfPartition_CheckDataRange(context, partition,
-                                    startOffset * WHFU_BYTES_PER_UNIT + byte_offset,
-                                   byte_count)) {
+    if (WH_ERROR_OK != nfPartition_CheckDataRange(
+                           context, partition,
+                           startOffset * WHFU_BYTES_PER_UNIT + byte_offset,
+                           byte_count)) {
         return WH_ERROR_BADARGS;
     }
 
     return wh_FlashUnit_ReadBytes(
-            context->cb,
-            context->flash,
-            startOffset * WHFU_BYTES_PER_UNIT + byte_offset,
-            byte_count,
-            out_data);
+        context->cb, context->flash,
+        startOffset * WHFU_BYTES_PER_UNIT + byte_offset, byte_count, out_data);
 }
 
 static int nfObject_Copy(whNvmFlashContext* context, int object_index,
@@ -727,13 +725,8 @@ static int nfObject_Copy(whNvmFlashContext* context, int object_index,
         }
 
         /* Read the data from the old object. */
-        ret = nfObject_ReadDataBytes(
-                context,
-                context->active,
-                object_index,
-                data_offset,
-                this_len,
-                buffer);
+        ret = nfObject_ReadDataBytes(context, context->active, object_index,
+                                     data_offset, this_len, buffer);
         if (ret != 0) return ret;
 
         /* Write the data to the new object. */
@@ -1242,30 +1235,23 @@ int wh_NvmFlash_DestroyObjects(void* c, whNvmId list_count,
 }
 
 /* Read the data of the object starting at the byte offset */
-int wh_NvmFlash_Read(void* c, whNvmId id, whNvmSize offset,
-        whNvmSize data_len, uint8_t* data)
+int wh_NvmFlash_Read(void* c, whNvmId id, whNvmSize offset, whNvmSize data_len,
+                     uint8_t* data)
 {
     whNvmFlashContext* context = c;
     int ret = 0;
-    int object_index = -1;
+    int                object_index = -1;
 
     if (    (context == NULL) ||
             ((data_len > 0) && (data == NULL)) ){
         return WH_ERROR_BADARGS;
     }
 
-    ret = nfMemDirectory_FindObjectIndexById(
-            &context->directory,
-            id,
-            &object_index);
+    ret = nfMemDirectory_FindObjectIndexById(&context->directory, id,
+                                             &object_index);
     if (ret == 0) {
-        ret = nfObject_ReadDataBytes(
-                context,
-                context->active,
-                object_index,
-                offset,
-                data_len,
-                data);
+        ret = nfObject_ReadDataBytes(context, context->active, object_index,
+                                     offset, data_len, data);
     }
     return ret;
 }

src/wh_nvm_flash_log.c

@@ -65,8 +65,9 @@
  *
  * Alignment consideration:
  *
- * The implementation assure that writes are aligned to WRITE_GRANULARITY in FLASH memory space.
- * The source data passed on the flash layer might not be aligned.
+ * The implementation assure that writes are aligned to WRITE_GRANULARITY in
+ * FLASH memory space. The source data passed on the flash layer might not be
+ * aligned.
  */
 
 #include "wolfhsm/wh_settings.h"
@@ -138,8 +139,8 @@ static whNvmFlashLogMetadata* nfl_ObjNext(whNvmFlashLogContext*  ctx,
 {
     if (obj == NULL || ctx == NULL)
         return NULL;
-    uint8_t* next = (uint8_t*)obj + sizeof(whNvmFlashLogMetadata) +
-                    PAD_SIZE(obj->meta.len);
+    uint8_t* next =
+        (uint8_t*)obj + sizeof(whNvmFlashLogMetadata) + PAD_SIZE(obj->meta.len);
     if (next >= ctx->directory.data + ctx->directory.header.size)
         return NULL;
     return (whNvmFlashLogMetadata*)next;
@@ -189,10 +190,10 @@ static int nfl_PartitionCommit(whNvmFlashLogContext* ctx, uint32_t partition)
     if (ctx == NULL || partition > 1)
         return WH_ERROR_BADARGS;
 
-    off = partition * ctx->partition_size;
+    off  = partition * ctx->partition_size;
     f_cb = ctx->flash_cb;
-    ret = f_cb->BlankCheck(ctx->flash_ctx, off,
-                           sizeof(whNvmFlashLogPartitionHeader));
+    ret  = f_cb->BlankCheck(ctx->flash_ctx, off,
+                            sizeof(whNvmFlashLogPartitionHeader));
     if (ret != 0)
         return ret;
 
@@ -216,8 +217,8 @@ static int nfl_PartitionChoose(whNvmFlashLogContext* ctx)
         return WH_ERROR_BADARGS;
 
     part1_offset = ctx->partition_size;
-    f_cb = ctx->flash_cb;
-    ret = f_cb->BlankCheck(ctx->flash_ctx, 0, sizeof(header0));
+    f_cb         = ctx->flash_cb;
+    ret          = f_cb->BlankCheck(ctx->flash_ctx, 0, sizeof(header0));
     if (ret != 0 && ret != WH_ERROR_NOTBLANK) {
         return ret;
     }
@@ -326,7 +327,8 @@ static int nfl_ObjectCount(whNvmFlashLogContext*  ctx,
     }
 
     if ((uint8_t*)startObj < ctx->directory.data ||
-        (uint8_t*)startObj >= ctx->directory.data + ctx->directory.header.size) {
+        (uint8_t*)startObj >=
+            ctx->directory.data + ctx->directory.header.size) {
         return 0;
     }
 
@@ -351,10 +353,9 @@ static int nfl_PartitionRead(whNvmFlashLogContext* ctx)
         return WH_ERROR_BADARGS;
 
     f_cb = ctx->flash_cb;
-    off = ctx->active_partition * ctx->partition_size;
+    off  = ctx->active_partition * ctx->partition_size;
 
-    ret = f_cb->Read(ctx->flash_ctx, off,
-                     sizeof(whNvmFlashLogPartitionHeader),
+    ret = f_cb->Read(ctx->flash_ctx, off, sizeof(whNvmFlashLogPartitionHeader),
                      (uint8_t*)&ctx->directory.header);
     if (ret != 0)
         return ret;
@@ -519,7 +520,8 @@ int wh_NvmFlashLog_List(void* c, whNvmAccess access, whNvmFlags flags,
     /* list all obects if start_id is WH_NVM_ID_INVALID */
     if (start_id == WH_NVM_ID_INVALID) {
         next_obj = (whNvmFlashLogMetadata*)ctx->directory.data;
-    } else {
+    }
+    else {
         start_obj = nfl_ObjectFindById(ctx, start_id);
         if (start_obj != NULL && start_obj->meta.id != WH_NVM_ID_INVALID)
             next_obj = nfl_ObjNext(ctx, start_obj);
@@ -603,7 +605,8 @@ int wh_NvmFlashLog_AddObject(void* c, whNvmMetadata* meta, whNvmSize data_len,
     int                    ret;
     uint32_t               count;
 
-    if (ctx == NULL || !ctx->is_initialized || meta == NULL || (data_len > 0 && data == NULL))
+    if (ctx == NULL || !ctx->is_initialized || meta == NULL ||
+        (data_len > 0 && data == NULL))
         return WH_ERROR_BADARGS;
 
     count = nfl_ObjectCount(ctx, NULL);
@@ -648,7 +651,8 @@ int wh_NvmFlashLog_DestroyObjects(void* c, whNvmId list_count,
     int                   i;
     int                   ret;
 
-    if (ctx == NULL || !ctx->is_initialized || (list_count > 0 && id_list == NULL))
+    if (ctx == NULL || !ctx->is_initialized ||
+        (list_count > 0 && id_list == NULL))
         return WH_ERROR_BADARGS;
 
     if (list_count == 0)

test/wh_test_cert.c

@@ -614,7 +614,7 @@ int whTest_CertRamSim(NvmTestBackendType nvmType)
     }};
     const whFlashCb  fcb[1]     = {WH_FLASH_RAMSIM_CB};
 
-    whNvmUnion nvm_setup;
+    whNvmUnion   nvm_setup;
     whNvmConfig  n_conf[1];
     whNvmContext nvm[1]    = {{0}};
 

test/wh_test_clientserver.c

@@ -778,7 +778,7 @@ int whTest_ClientServerSequential(NvmTestBackendType nvmType)
     }};
     const whFlashCb  fcb[1]     = {WH_FLASH_RAMSIM_CB};
 
-    whNvmUnion nvm_setup;
+    whNvmUnion   nvm_setup;
     whNvmConfig  n_conf[1];
     whNvmContext nvm[1]    = {{0}};
 
@@ -1801,11 +1801,12 @@ static int wh_ClientServer_MemThreadTest(NvmTestBackendType nvmType)
     }};
     const whFlashCb  fcb[1]          = {WH_FLASH_RAMSIM_CB};
 
-    whNvmUnion nvm_setup;
+    whNvmUnion   nvm_setup;
     whNvmConfig  n_conf[1] = {0};
     whNvmContext nvm[1]    = {{0}};
 
-    WH_TEST_RETURN_ON_FAIL(whTest_NvmSetup(nvmType, &nvm_setup, n_conf, fc_conf, fc, fcb));
+    WH_TEST_RETURN_ON_FAIL(
+        whTest_NvmSetup(nvmType, &nvm_setup, n_conf, fc_conf, fc, fcb));
 
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     /* Crypto context */
@@ -1884,9 +1885,9 @@ static int wh_ClientServer_PosixMemMapThreadTest(NvmTestBackendType nvmType)
     }};
     const whFlashCb  fcb[1]     = {WH_FLASH_RAMSIM_CB};
 
-    whNvmUnion nvm_setup;
+    whNvmUnion   nvm_setup;
     whNvmConfig  n_conf[1];
-    whNvmContext nvm[1]    = {{0}};
+    whNvmContext nvm[1] = {{0}};
 
     WH_TEST_RETURN_ON_FAIL(
         whTest_NvmSetup(nvmType, &nvm_setup, n_conf, fc_conf, fc, fcb));
@@ -1934,23 +1935,27 @@ int whTest_ClientServer(void)
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
     printf("Testing client/server sequential: mem + flash log...\n");
-    WH_TEST_ASSERT(0 == whTest_ClientServerSequential(NVM_TEST_BACKEND_FLASH_LOG));
+    WH_TEST_ASSERT(0 ==
+                   whTest_ClientServerSequential(NVM_TEST_BACKEND_FLASH_LOG));
 #endif /* defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG) */
 
 #if defined(WOLFHSM_CFG_TEST_POSIX)
     printf("Testing client/server: (pthread) mem...\n");
     WH_TEST_ASSERT(0 == wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH));
 
     printf("Testing client/server: (pthread) POSIX shared memory ...\n");
-    WH_TEST_ASSERT(0 == wh_ClientServer_PosixMemMapThreadTest(NVM_TEST_BACKEND_FLASH));
+    WH_TEST_ASSERT(
+        0 == wh_ClientServer_PosixMemMapThreadTest(NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
     printf("Testing client/server: (pthread) mem + flash log...\n");
     WH_TEST_ASSERT(0 ==
                    wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
 
-    printf("Testing client/server: (pthread) POSIX shared memory + flash log...\n");
-    WH_TEST_ASSERT(0 == wh_ClientServer_PosixMemMapThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
+    printf("Testing client/server: (pthread) POSIX shared memory + flash "
+           "log...\n");
+    WH_TEST_ASSERT(
+        0 == wh_ClientServer_PosixMemMapThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
 #endif /* defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG) */
 
 #endif /* defined(WOLFHSM_CFG_TEST_POSIX) */

test/wh_test_common.c

@@ -31,9 +31,11 @@
 /**
  * Helper function to configure and select an NVM backend for testing.
  *
- * @param type      The type of NVM backend to configure (see NvmTestBackendType).
+ * @param type      The type of NVM backend to configure (see
+ * NvmTestBackendType).
  * @param nvmSetup  Pointer to a union of NVM backend setup structures (output).
- * @param nvmCfg    Pointer to the NVM configuration structure to populate (output).
+ * @param nvmCfg    Pointer to the NVM configuration structure to populate
+ * (output).
  * @param fCfg      Pointer to the RamSim flash configuration structure.
  * @param fCtx      Pointer to the RamSim flash context structure.
  * @param fCb       Pointer to the RamSim flash callback structure.

test/wh_test_common.h

@@ -26,10 +26,10 @@
 #include <assert.h>
 #endif
 
-#include<wolfhsm/wh_nvm.h>
-#include<wolfhsm/wh_flash_ramsim.h>
-#include<wolfhsm/wh_nvm_flash.h>
-#include<wolfhsm/wh_nvm_flash_log.h>
+#include <wolfhsm/wh_nvm.h>
+#include <wolfhsm/wh_flash_ramsim.h>
+#include <wolfhsm/wh_nvm_flash.h>
+#include <wolfhsm/wh_nvm_flash_log.h>
 
 #define WH_TEST_FAIL (-1)
 #define WH_TEST_SUCCESS (0)
@@ -108,7 +108,6 @@
     } while (0)
 
 
-
 typedef enum {
     NVM_TEST_BACKEND_FLASH = 0,
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)

test/wh_test_crypto.c

@@ -3658,9 +3658,9 @@ static int wh_ClientServer_MemThreadTest(NvmTestBackendType nvmType)
     }};
     const whFlashCb  fcb[1]          = {WH_FLASH_RAMSIM_CB};
 
-    whNvmUnion nvm_setup;
+    whNvmUnion   nvm_setup;
     whNvmConfig  n_conf[1];
-    whNvmContext nvm[1]    = {{0}};
+    whNvmContext nvm[1] = {{0}};
 
     WH_TEST_RETURN_ON_FAIL(
         whTest_NvmSetup(nvmType, &nvm_setup, n_conf, fc_conf, fc, fcb));
@@ -3697,11 +3697,13 @@ static int wh_ClientServer_MemThreadTest(NvmTestBackendType nvmType)
 int whTest_Crypto(void)
 {
     printf("Testing crypto: (pthread) mem...\n");
-    WH_TEST_RETURN_ON_FAIL(wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH));
+    WH_TEST_RETURN_ON_FAIL(
+        wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
     printf("Testing crypto: (pthread) mem (flash log)...\n");
-    WH_TEST_RETURN_ON_FAIL(wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
+    WH_TEST_RETURN_ON_FAIL(
+        wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
 #endif
 
     return 0;