more -Wsign-compare fixes.

dist/pdisk/deblock_media.c

@@ -103,7 +103,7 @@ new_deblock_media(void)
 
 
 MEDIA
-open_deblock_media(long new_block_size, MEDIA m)
+open_deblock_media(unsigned long new_block_size, MEDIA m)
 {
     DEBLOCK_MEDIA   a;
     unsigned long   block_size;

dist/pdisk/deblock_media.h

@@ -54,6 +54,6 @@
 /*
  * Forward declarations
  */
-MEDIA open_deblock_media(long new_block_size, MEDIA m);
+MEDIA open_deblock_media(unsigned long new_block_size, MEDIA m);
 
 #endif /* __deblock_media__ */

dist/pdisk/dump.c

@@ -861,7 +861,7 @@ int
 get_max_base_or_length(partition_map_header *map)
 {
     partition_map * entry;
-    int max;
+    unsigned int max;
 
     if (map == NULL) {
 	return 0;

dist/pdisk/file_media.c

@@ -280,7 +280,7 @@ read_file_media(MEDIA m, long long offset, unsigned long count, void *address)
 	/* do the read */
 	off = offset;
 	if ((off = llseek(a->fd, off, 0)) >= 0) {
-	    if ((t = read(a->fd, address, count)) == count) {
+	    if ((t = read(a->fd, address, count)) == (ssize_t)count) {
 		rtn_value = 1;
 	    } else {
 		fprintf(stderr,"read failed\n");
@@ -317,7 +317,7 @@ write_file_media(MEDIA m, long long offset, unsigned long count, void *address)
 	/* do the write  */
 	off = offset;
 	if ((off = llseek(a->fd, off, 0)) >= 0) {
-	    if ((t = write(a->fd, address, count)) == count) {
+		if ((t = write(a->fd, address, count)) == (ssize_t)count) {
 		if (off + count > a->m.size_in_bytes) {
 			a->m.size_in_bytes = off + count;
 		}

dist/pdisk/io.c

@@ -404,7 +404,7 @@ get_multiplier(long divisor)
 	    } else {
 		result *= extra;
 	    }
-	} else if (result >= divisor) {
+	} else if ((long long)result >= divisor) {
 	    result /= divisor;
 	} else {
 	    result = 1;

dist/pdisk/partition_map.c

@@ -235,7 +235,7 @@ read_partition_map(partition_map_header *map)
 {
     DPME *data;
     u32 limit;
-    int ix;
+    unsigned int ix;
     int old_logical;
     double d;
 
@@ -701,7 +701,7 @@ add_partition_to_map(const char *name, const char *dptype, u32 base, u32 length,
     } else {
 	limit = map->maximum_in_map;
     }
-    if (map->blocks_in_map + act > limit) {
+    if (map->blocks_in_map + (int)act > limit) {
 	printf("the map is not big enough\n");
 	return 0;
     }
@@ -1302,11 +1302,11 @@ insert_in_base_order(partition_map *entry)
 
 
 void
-resize_map(long new_size, partition_map_header *map)
+resize_map(unsigned long new_size, partition_map_header *map)
 {
     partition_map * entry;
     partition_map * next;
-    int incr;
+    unsigned int incr;
 
     // find map entry
     entry = find_entry_by_type(kMapType, map);

dist/pdisk/partition_map.h

@@ -114,7 +114,7 @@ partition_map* find_entry_by_base(u32 base, partition_map_header *map);
 partition_map_header* init_partition_map(char *name, partition_map_header* oldmap);
 void move_entry_in_map(long, long, partition_map_header *);
 partition_map_header* open_partition_map(char *name, int *valid_file, int ask_logical_size);
-void resize_map(long new_size, partition_map_header *map);
+void resize_map(unsigned long new_size, partition_map_header *map);
 void write_partition_map(partition_map_header *map);
 void bzb_init_slice(BZB *bp, int slice);
 void dpme_init_flags(DPME *data);

dist/pdisk/validate.c

@@ -354,7 +354,7 @@ validate_map(partition_map_header *map)
 {
     range_list *list;
     char *name;
-    int i;
+    unsigned int i;
     u32 limit;
     int printed;