You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/22 03:38:48 UTC
[incubator-nuttx] 10/22: fs/nxffs/nxffs_reformat.c: Appease nxstyle
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d28d5a29c28246652201e63c45ecf531b2ce8b46
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sun Nov 22 09:54:57 2020 +0900
fs/nxffs/nxffs_reformat.c: Appease nxstyle
---
fs/nxffs/nxffs_reformat.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/fs/nxffs/nxffs_reformat.c b/fs/nxffs/nxffs_reformat.c
index 338efa9..9f2d1a7 100644
--- a/fs/nxffs/nxffs_reformat.c
+++ b/fs/nxffs/nxffs_reformat.c
@@ -178,7 +178,8 @@ static int nxffs_badblocks(FAR struct nxffs_volume_s *volume)
i++, block++, blkptr += volume->geo.blocksize)
#endif
{
- FAR struct nxffs_block_s *blkhdr = (FAR struct nxffs_block_s *)blkptr;
+ FAR struct nxffs_block_s *blkhdr =
+ (FAR struct nxffs_block_s *)blkptr;
/* Assume that this is a good block until we learn otherwise */
@@ -207,8 +208,8 @@ static int nxffs_badblocks(FAR struct nxffs_volume_s *volume)
if (memcmp(blkhdr->magic, g_blockmagic, NXFFS_MAGICSIZE) != 0 ||
blkhdr->state != BLOCK_STATE_GOOD)
{
- /* The block is not formatted with the NXFFS magic bytes or else
- * the block is specifically marked bad.
+ /* The block is not formatted with the NXFFS magic bytes or
+ * else the block is specifically marked bad.
*/
good = false;
@@ -220,9 +221,11 @@ static int nxffs_badblocks(FAR struct nxffs_volume_s *volume)
else
{
- size_t blocksize = volume->geo.blocksize - SIZEOF_NXFFS_BLOCK_HDR;
- size_t erasesize = nxffs_erased(&blkptr[SIZEOF_NXFFS_BLOCK_HDR],
- blocksize);
+ size_t blocksize = volume->geo.blocksize -
+ SIZEOF_NXFFS_BLOCK_HDR;
+ size_t erasesize = nxffs_erased(
+ &blkptr[SIZEOF_NXFFS_BLOCK_HDR],
+ blocksize);
good = (blocksize == erasesize);
}