changeset 750:faa9c2c03b5a

objstore: move dirblock serialization checks into a separate function Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Mon, 30 Mar 2020 08:48:26 -0400
parents ba7c47730f68
children 987b99547e89
files src/objstore/dirblock.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/objstore/dirblock.c	Sun Mar 29 19:20:13 2020 -0400
+++ b/src/objstore/dirblock.c	Mon Mar 30 08:48:26 2020 -0400
@@ -35,11 +35,17 @@
 	block->ndirents = 0;
 }
 
+static void __dirblock_serialize_check_dirent(struct dirblock *block,
+					      size_t dirent)
+{
+	ASSERT3U(block->entries[dirent].dirent.namelen, <=, MAX_NAME_LEN);
+}
+
 int dirblock_serialize(struct dirblock *block, struct buffer *buf)
 {
 	struct obj_dir_header hdr;
 	size_t off;
-	int i, j;
+	size_t i, j;
 	int ret;
 
 	ASSERT3U(block->used_bytes, <=, DIR_BLOCK_SIZE);
@@ -63,7 +69,7 @@
 		struct ndirent_phys dirent;
 		struct buffer tmp;
 
-		ASSERT3U(block->entries[i].dirent.namelen, <=, MAX_NAME_LEN);
+		__dirblock_serialize_check_dirent(block, i);
 
 		/* fill in the missing pieces */
 		block->entries[i].dirent.tgtoff = off +