Minor tweaks: zero unused part of the header, fixup a debug printf

os/imagezip/ffs/ffs.c

@@ -629,11 +629,6 @@ inodefixup(void *bstart, off_t bsize, void *fdata)
 	void *ptr, *eptr;
 	int inodesize;
 
-	if (debug > 1)
-		fprintf(stderr, "inodefixup: data [%p-%p], fs=UFS%d\n",
-			bstart, bstart+bsize-1,
-			magic == FS_UFS2_MAGIC ? 2 : 1);
-
 	switch (magic) {
 	case FS_UFS1_MAGIC:
 		inodesize = sizeof(struct ufs1_dinode);
@@ -647,6 +642,11 @@ inodefixup(void *bstart, off_t bsize, void *fdata)
 	}
 	assert((bsize % inodesize) == 0);
 
+	if (debug > 1)
+		fprintf(stderr, "inodefixup: %d UFS%d inodes\n",
+			(int)(bsize / inodesize),
+			magic == FS_UFS2_MAGIC ? 2 : 1);
+
 	for (ptr = bstart, eptr = ptr+bsize; ptr < eptr; ptr += inodesize) {
 		uint32_t gen;
 

os/imagezip/imagezip.c

@@ -1786,6 +1786,7 @@ compress_image(void)
 		/*
 		 * Moving to the next block. Reserve the header area.
 		 */
+		memset(buf, 0, DEFAULTREGIONSIZE);
 		buffer_offset = DEFAULTREGIONSIZE;
 		curregion     = regions;
 		numregions    = 0;