 @@ -260,27 +260,27 @@ read_file_media(MEDIA m, long long offse
     rtn_value = 0;
     if (a == 0) {
 	/* no media */
 	fprintf(stderr,"no media\n");
     } else if (a->m.kind != file_info.kind) {
 	/* wrong kind - XXX need to error here - this is an internal problem */
 	fprintf(stderr,"wrong kind\n");
     } else if (count <= 0 || count % a->m.grain != 0) {
 	/* can't handle size */
 	fprintf(stderr,"bad size\n");
     } else if (offset < 0 || offset % a->m.grain != 0) {
 	/* can't handle offset */
 	fprintf(stderr,"bad offset\n");
-    } else if (offset + count > a->m.size_in_bytes && a->m.size_in_bytes != (long long) 0) {
+    } else if (offset + (long long) count > a->m.size_in_bytes && a->m.size_in_bytes != (long long) 0) {
 	/* check for offset (and offset+count) too large */
 	fprintf(stderr,"offset+count too large\n");
     } else if (offset + count > (long long) LOFF_MAX) {
 	/* check for offset (and offset+count) too large */
 	fprintf(stderr,"offset+count too large 2\n");
     } else {
 	/* do the read */
 	off = offset;
 	if ((off = llseek(a->fd, off, 0)) >= 0) {
 	    if ((t = read(a->fd, address, count)) == (ssize_t)count) {
 		rtn_value = 1;
 	    } else {
 		fprintf(stderr,"read failed\n");
 @@ -308,27 +308,27 @@ write_file_media(MEDIA m, long long offs
     } else if (a->m.kind != file_info.kind) {
 	/* wrong kind - XXX need to error here - this is an internal problem */
     } else if (count <= 0 || count % a->m.grain != 0) {
 	/* can't handle size */
     } else if (offset < 0 || offset % a->m.grain != 0) {
 	/* can't handle offset */
     } else if (offset + count > (long long) LOFF_MAX) {
 	/* check for offset (and offset+count) too large */
     } else {
 	/* do the write  */
 	off = offset;
 	if ((off = llseek(a->fd, off, 0)) >= 0) {
 		if ((t = write(a->fd, address, count)) == (ssize_t)count) {
-		if (off + count > a->m.size_in_bytes) {
+		if (off + (long long) count > a->m.size_in_bytes) {
 			a->m.size_in_bytes = off + count;
+		}
 		rtn_value = 1;
+	    }
+	}
+    }
     return rtn_value;
+}
 long
 close_file_media(MEDIA m)
+{

 @@ -80,43 +80,43 @@ dump_using_layout(void *buffer, layout *
 	    max_name = value;
+	}
+    }
     for (entry = desc; entry->format != kEnd; entry++) {
 	if (entry->format != kBit) {
 	    printf("%*s: ", max_name, entry->name);
 	    byte_length = entry->bit_length / 8;
 	    if (entry->bit_offset != 0 || (entry->bit_length % 8) != 0) {
-		printf("entry %d, can't handle bitfields yet.\n", entry - desc);
+		printf("entry %d, can't handle bitfields yet.\n", (int)(entry - desc));
 		continue;
+	    }
 	    value = 0;
 	    for (i = entry->byte_offset; byte_length > 0;i++) {
 		value = value << 8;
 		value |= ((unsigned char *)buffer)[i];
 		byte_length--;
+	    }
 	} else {
 	    if (entry->bit_offset < 0 || entry->bit_offset > 8) {
-		printf("entry %d, bad bit offset (%d).\n", entry - desc, entry->bit_offset);
+		printf("entry %d, bad bit offset (%d).\n", (int)(entry - desc), entry->bit_offset);
 		continue;
 	    } else if (entry->bit_length <= 0
 		    || entry->bit_length > (entry->bit_offset + 1)) {
-		printf("entry %d, bad bit length (%d,%d).\n", entry - desc,
+		printf("entry %d, bad bit length (%d,%d).\n", (int)(entry - desc),
 			entry->bit_offset, entry->bit_length);
 		continue;
+	    }
 	    value = (((unsigned char *)buffer)[entry->byte_offset]
 		    & bitmasks[entry->bit_offset])
 		    >> ((entry->bit_offset + 1) - entry->bit_length);
+	}
 	switch (entry->format) {
 	case kHex:
 	    printf("0x%x\n", (unsigned int) value);
 	    break;
 	case kDec:
 @@ -131,27 +131,27 @@ dump_using_layout(void *buffer, layout *
 	    byte_length = entry->bit_length / 8;
 	    switch (byte_length) {
 	    case 4: printf("%lu\n", (unsigned long)value); break;
 	    case 2: printf("%u\n", (unsigned short)value); break;
 	    case 1: printf("%u\n", (unsigned char)value); break;
+	    }
 	    break;
 	case kBit:
 	    if (value) {
 		printf("%*s  %s\n", max_name, "", entry->name);
+	    }
 	    break;
 	default:
-	    printf("entry %d, unknown format (%d).\n", entry - desc, entry->format);
+	    printf("entry %d, unknown format (%d).\n", (int)(entry - desc), entry->format);
 	    break;
+	}
+    }
+}
 void
 DumpRawBuffer(unsigned char *bufferPtr, int length )
+{
 	register int            i;
 	int                     lineStart;
 	int                     lineLength;
 	short                   c;