Many files:
block.c (ext2fs_block_iterate2): Use retval which is a errcode_t type.
bitmaps.c (make_bitmap): Use size_t instead of int where appropriate.
bb_inode.c (set_bad_block_proc): Add #pragma argsused for Turbo C.
alloc.c (ext2fs_new_inode): Use ino_t instead of int for the group number.
get_pathname.c: Use ino_t instead of int where appropriate.
ext2fs.h: Make the magic structure element be errcode_t instead of int.
alloc.c alloc_tables.c badblocks.c bb_compat.c bb_inode.c
bitmaps.c block.c bmove.c brel_ma.c check_desc.c closefs.c
cmp_bitmaps.c dblist.c dblist_dir.c dir_iterate.c dirblock.c
dupfs.c expanddir.c freefs.c get_pathname.c icount.c
initialize.c inline.c inode.c irel_ma.c link.c llseek.c
lookup.c mkdir.c namei.c newdir.c read_bb.c read_bb_file.c
rs_bitmap.c rw_bitmaps.c swapfs.c test_io.c tst_badblocks.c
tst_iscan.c unix_io.c unlink.c valid_blk.c version.c: Add an
#ifdef for HAVE_UNISTD_H
diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
index defa0cd..46b4ee6 100644
--- a/lib/ext2fs/bitmaps.c
+++ b/lib/ext2fs/bitmaps.c
@@ -12,7 +12,9 @@
#include <stdio.h>
#include <string.h>
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <fcntl.h>
#include <time.h>
@@ -31,7 +33,7 @@
ext2fs_generic_bitmap *ret)
{
ext2fs_generic_bitmap bitmap;
- int size;
+ size_t size;
bitmap = malloc(sizeof(struct ext2fs_struct_generic_bitmap));
if (!bitmap)
@@ -53,7 +55,7 @@
} else
bitmap->description = 0;
- size = ((bitmap->real_end - bitmap->start) / 8) + 1;
+ size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1);
bitmap->bitmap = malloc(size);
if (!bitmap->bitmap) {
free(bitmap->description);
@@ -187,7 +189,7 @@
return;
memset(bitmap->bitmap, 0,
- ((bitmap->real_end - bitmap->start) / 8) + 1);
+ (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));
}
void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap)
@@ -196,5 +198,5 @@
return;
memset(bitmap->bitmap, 0,
- ((bitmap->real_end - bitmap->start) / 8) + 1);
+ (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));
}