CVS commit: src/dist/pdisk

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Mon Mar 22 05:08:54 UTC 2010

Modified Files:
        src/dist/pdisk: file_media.c layout_dump.c

Log Message:
fix some powerpc64 build issues.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/dist/pdisk/file_media.c
cvs rdiff -u -r1.2 -r1.3 src/dist/pdisk/layout_dump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/dist/pdisk/file_media.c
diff -u src/dist/pdisk/file_media.c:1.5 src/dist/pdisk/file_media.c:1.6
--- src/dist/pdisk/file_media.c:1.5	Sat Apr 18 06:37:35 2009
+++ src/dist/pdisk/file_media.c	Mon Mar 22 05:08:54 2010
@@ -270,7 +270,7 @@
     } 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) {
@@ -318,7 +318,7 @@
 	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;

Index: src/dist/pdisk/layout_dump.c
diff -u src/dist/pdisk/layout_dump.c:1.2 src/dist/pdisk/layout_dump.c:1.3
--- src/dist/pdisk/layout_dump.c:1.2	Wed Jul 13 15:25:29 2005
+++ src/dist/pdisk/layout_dump.c	Mon Mar 22 05:08:54 2010
@@ -90,7 +90,7 @@
 	    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;
 	    }
 	    
@@ -102,11 +102,11 @@
 	    }
 	} 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;
 	    }
@@ -141,7 +141,7 @@
 	    }
 	    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;
 	}
     }