-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-AUX big_pt.patch 1485 RMD160 d5bcb35c91a2705e447412d1a69ef6a1ef50cb69 SHA1 2f9d469bfe7c356bbde8978edb3b6ee44dc5e18d SHA256 2264e3f01ab3de1e96b3204a8a8d31c98253bb1fc388d41f7bf6cdb7a623cb1b
-AUX largerthan2gb.patch 345 RMD160 1b50db957b7e218d40c51081b568fc44d0623cdf SHA1 5a636840c08f19430ffb7bfb0997e00338728bb4 SHA256 c635f03493854053ba41af9bec6cc9aab5ae2b73a7906c74bb297ee63dcc1cbb
-AUX mac-fdisk-0.1-headers.patch 2218 RMD160 d9efe5117a58482a1029191820c01665ecf17e0f SHA1 570d67d3610db962308635a1ccf3f52e551f1726 SHA256 c03ebe8c9f9afc0d532682e8684f76b4a99de7edc3ca58102f1f8b361f293153
-AUX mac-fdisk-0.1-r6-ppc64.patch 15294 RMD160 4ef172a586868498756309eeb4a3814c3ed0f346 SHA1 0786b0f4502305a8db593d9fc52181e61de67be4 SHA256 66d7ffd675b04c6616cf2b365d80e766b81e030e9578b4abe0480c96f2819585
-AUX mac-fdisk-amd64.patch 5663 RMD160 55f23ccd1831765f0d788138237c15660a508408 SHA1 f21b2618ed63b7263ecdeab4aa49082078b46b8e SHA256 58333057a2860e33442b516099cff09e388dc4d16064eac3007b1688f97828bb
-DIST mac-fdisk_0.1-13.diff.gz 19615 RMD160 cc6ddbdee6c8bac9d03d6ae50fc6d23e29a21188 SHA1 725d13418c087059cba76cc8b227e72d7b99ada2 SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644
-DIST mac-fdisk_0.1.orig.tar.gz 55817 RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 SHA1 47013d3d74892d53c31a73e75c32fda2bf173252 SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66
-EBUILD mac-fdisk-0.1-r6.ebuild 1252 RMD160 b454dff39aeecb306bb3a0ff07d34336d5b62f47 SHA1 8bcc724ced44b09ba9467c76e272535c334c55ac SHA256 95634ee3740bb29138b41869858356b85874a033c827de1e01408d232df59874
-EBUILD mac-fdisk-0.1-r7.ebuild 1456 RMD160 f34b7175d39ef67d06c13b8c2a0d23bfc651b79a SHA1 2b69ddfe91a234fbc6087c892cc708954ad8e81a SHA256 aaa244baa7b316cc70761326075c44724abff93a54af6632f0143812478a4ca6
-MISC ChangeLog 4757 RMD160 3919456ca12e3faaee812f7f8627b6f5a201a6ca SHA1 7f4c6a6250bd923905b7815ffb79d6fc8e6319b3 SHA256 582170d6b7f08f975a8d44d7a7f095e5b7ce743363643faf284d2ef6d7d2e31f
-MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
+AUX big_pt.patch 1404 SHA256 217659768cea64ac99133f3b67307c2687f6d8682f1dfe0669706a48a9fcb2ef SHA512 c9abc952f1ce618b085a134145fa99efa9c10b55f3fa773fb6b74a66468537bc3567ec632fe6e464c5158383135c858c171d8d94d7142d38beff39a17e31187a WHIRLPOOL aafbfcab1dc615f79e15f5f19fd59227a4796f89ae305f3f7983c271e2cb1f5dbf396b3c404bfca48e076c886b7bd4141d79b4961f48da624d730b262efe9a39
+AUX largerthan2gb.patch 272 SHA256 0132bb4185d5ec13a4f2220579763c83e6472eeba1c30f6972ba8e3039ffa0b3 SHA512 b5988eb6aa64324421398461396b0fdd0b55d7643094c042bea7264ec0f9913e8a793f3f550c15928419e697a14f2932f483c4b98a54618af99b35aa7ceae757 WHIRLPOOL 764b5d517ceb3d5be1051b8d336f8fe263d54890226d7e30bd91e752ebb394da592f4b89c191c3b6c4b6573e9f1b4efa08897222e7b3eede2cdb4723ff70e8ce
+AUX mac-fdisk-0.1-headers.patch 2050 SHA256 02fa96e89dabe0eeaeb219ecbf88ec553639f7b84d58e7e058d589daf2cdff0f SHA512 7d16300c02b293de87101e3ef83a8b7778d15123c261d562f0129704b74d0c3d7ca18730c52d37b599ff57c0b70dacd41aeefe99cf235aea4abd4b569e3d601e WHIRLPOOL 8352856e33188473d6d5ab952c5f72e077dc0dd7d32b4e5b48a1a6182616cbdfe333fd620bde24077c5791101ad90cb93b7b95031a12f8f042bc74b0b16c9295
+AUX mac-fdisk-0.1-r6-ppc64.patch 13664 SHA256 12832aad918475b3e3c0e8fc2f8bc4cead0baa2f2de1f365aeb7206839988988 SHA512 8ad99f6f205d7f4ced33c1da93a76b4329c24c85e85ea5f0fda579002d1e7282c5764cdec37c7a7c99e4f198d34259a382ed37cead60b8307a7779806142d49b WHIRLPOOL 2edb5bd17c5dbbb5fc4516973fe1e77125f2431b15590bc348ae5cb03c474d6cdff5ac1cf81d7fc3d12625a786111c5bae3cf3212095a44f28018fc6862cf2fe
+AUX mac-fdisk-0.1_p16-ppc64.patch 12912 SHA256 18ad277e06b9f67397a2d91b288fb67a303d4edc995300c8c6e5d614619b7858 SHA512 e521009d628934fe3925085c941d2bb3fba9c3322ccaaa6dd650ecbc6b990056f9bf186adb3a645dc8593efdb44611b69a7b6bf4e87d262870bbb515581e0ef3 WHIRLPOOL 851fa2b80397526b9ab7d6cac7076671cc2a154802d10af175c6c620100114bd18d8db0838563d2585512f82a32bf0c29eb5d8ecd9f81008416e33924ae47675
+AUX mac-fdisk-amd64.patch 5154 SHA256 8c0a160d1f93b5cd79265a088eff3546a3963512a619d9570aae60b63517a7ec SHA512 241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c WHIRLPOOL 2b603a9c1c68431013f014ddd13456ee33526ab1faea4973147d9c345f3ca958fbaf017ed15c7edd37d564a7ccdd92300520d32fab471896205ac62f647c164b
+DIST mac-fdisk_0.1-13.diff.gz 19615 SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644 SHA512 adc34f20e73ae91c39acb073f70f0041a4a0726985fc5e5de34ae433996b3f719ca4193cce51efc6599ba1773ad63fee045a8d72b6bd8a036c188d762626fe57 WHIRLPOOL 9badaa6a514eb95623bf6dfc1815935a2510a0a8ef9b2546aa0c0e3816c9b9ab584ac3136f28988d3f6768dfaec7ed9d49cac6fbfa1384e029128a565743e983
+DIST mac-fdisk_0.1-16.diff.gz 19896 SHA256 0ab4247a80734cffcebd439b2c6021a5560daf4d5bb246af3ee0a75d52bfd486 SHA512 deb44217afae097594e14dea6cd128f6cb1e8ed6e62e646d2aa311508ea27d164c94187e8eb1f1d018ee6044346f6785770981a655b6ad536dbbce550df13359 WHIRLPOOL 5f34bdc9ef8e0b823e5113cf79ddc2e9007f5e18c90c7c162e025e65c349407baf7f0da9aae4a5d1615af87ab3b2cade65265aef88d7413625a44c8a531b426c
+DIST mac-fdisk_0.1.orig.tar.gz 55817 SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120 WHIRLPOOL 3a25aba4950933c677d56a1f8c8aa000520818cf413c3cf3f418be5ec2ad520f9d9542771b61b2e53ad58e4dfa3298acab551eef8fb1a0cbac93a390f9968bb4
+EBUILD mac-fdisk-0.1-r7.ebuild 1456 SHA256 aaa244baa7b316cc70761326075c44724abff93a54af6632f0143812478a4ca6 SHA512 3626c9ef6e9f44f01d5343430ce1471617c662e2f92c5f9cfdb6e8cb189dd5b72e6fb01af153a4ddf065e8e2c0e68dcf0395c857bcb48fe953f5a1cb75ff789e WHIRLPOOL addde28cb3b14273261e947a8ab43c4951cc31f3ce075903dc01dbaafe48dedbdf221435d9303377f22b421ee649fc599051e1b05baeb071aeece3e87c0e2636
+EBUILD mac-fdisk-0.1_p16.ebuild 1352 SHA256 e55989642aad27f0ce366e866ee9309f202c1b739483ad84e3a2fc35624c5473 SHA512 25e4c76755f92c7b33c7325599577bcfa1432a1988dbabb55fff8887cd38d456d6ba248f121d1fd954a871ba95e38f5cb256a144cd9b8dbb69f451b7a2babd64 WHIRLPOOL b44b6d3189afb73f37d997e67c565649c9920f90762825bc2a7615de0cf9f7391cd030b9911b9f3c7ca511c021f9855d08a801f738bbe0f91c3d4ca77885e2ea
+MISC ChangeLog 5147 SHA256 59c340008e0ebd7c5961b61de962f0b73794e50b42a3e07648306a1b252f087c SHA512 dae95511ba4fc248507a3aa3c2d8f474c4f09ac78e7ab9308059d7bbff151153fe727affe0c9e5ed54d5fe93f166e54155f56425b47ac69971f48d2bb3e23797 WHIRLPOOL 0e47ae59621a8aaa8596697e40bded1c5c2d367fd9cb61c44f8f1216a5ad802e63b75b1d86178c596996faa008677a5ad60207503246115fc14975a6e680d993
+MISC metadata.xml 156 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851 SHA512 548ef79e66b1c56bc3252243bc6e6570ad3565974c44c96d942b203019cbb41743dc682eccc056eb21257163182bf4c1bac305b91c7ab5dc99da289f71919c3f WHIRLPOOL d2421da96c721b6cfd747e0e857e541d7add0997cd0a862ebeaf0d5d576a19c275d1c407a9c06a546d9b8a672d7c5fa0f6dab47ec5574c8ed5eb7290f2a85e46
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
-iQIcBAEBAgAGBQJPsrQIAAoJEPTTRK0uRVaNDSMQAJaODPgqHfCjoxhJpp9GW3hE
-+p3j2q/jIoQP2/zZe+9DXCnTMGUZCXt7+j5xw1JDj0eBEB7FcNw/KyM7MY9lDoyO
-I8KWT6v3t6iB10DfbFSOcw1FtQHtjv4r4WC3GGpVXsPp1MTS5SEh9shrNjjMB2v8
-uCTygbfFdf4nNctf8REZdU5HlzHcbUTCtJ9J6W5XqU6yfGYxMcamBj/hZoVDzM5G
-AH4BV8RpExqd1qnkom5VlHC2T7bpmHMUVNOlVRIIT9HqmGcO0PjcQtV7HUT4SaQh
-RNSk7DZWKVmefC8wdvxmIxAiyHbA31AriL2Jfw2Jbu49BawO/9eyhKIG2B7y3FBW
-hqAB0d0xzN+oTTg3PvLSRL/blxl6p5LioSNjg66ciOc0mQRhqJjFyubB6zCgfUz+
-hx8T5cu1Fx4WYWRo6WJK7OmmfYx+CNtEVYwp0aRI7CPmyk2Bm3zD/3QDSL7PTbto
-yQ94kHo+qPlm8joZkKMLi4pKOrAn1Ziz9l1QT+rcu8jvfLD5/pf4CsTMJCxaYZSE
-+cf/gZoVbQsZOHDO/sVNQ+MopfMhBjdT2diSG18CONN6IVpuvzd0/Jn+KY7Q7EDA
-8Ym0YI3wS5dEEubhBH5b1YRM5FM5OYfAcA7rQa1pMlvfhvK81IoduAPNlfmiyTIG
-ueGergVGX0biitw84Iw1
-=g4JH
+iEYEAREIAAYFAlVEsZoACgkQVWmRsqeSphNNOgCeI92MyojhAuJ/ynx64JeYeoCr
+PFUAn2CPu/l85AA7fj967eqM3A+8lbIh
+=woWk
-----END PGP SIGNATURE-----
--- /dev/null
+--- a/bitfield.c
++++ b/bitfield.c
+@@ -67,13 +67,12 @@
+ //
+ // Routines
+ //
+-unsigned long
+-bitfield_set(unsigned long *bf, int base, int length, unsigned long value)
++unsigned int
++bitfield_set(unsigned int *bf, int base, int length, unsigned int value)
+ {
+- unsigned long t;
+- unsigned long m;
++ unsigned int t;
++ unsigned int m;
+ int s;
+- int i;
+
+ // compute shift & mask, coerce value to correct number of bits,
+ // zap the old bits and stuff the new value
+@@ -86,12 +85,11 @@
+ }
+
+
+-unsigned long
+-bitfield_get(unsigned long bf, int base, int length)
++unsigned int
++bitfield_get(unsigned int bf, int base, int length)
+ {
+- unsigned long m;
++ unsigned int m;
+ int s;
+- int i;
+
+ // compute shift & mask
+ // return the correct number of bits (shifted to low end)
+--- a/bitfield.h
++++ b/bitfield.h
+@@ -63,5 +63,5 @@
+ //
+ // Forward declarations
+ //
+-unsigned long bitfield_set(unsigned long *bf, int base, int length, unsigned long value);
+-unsigned long bitfield_get(unsigned long bf, int base, int length);
++unsigned int bitfield_set(unsigned int *bf, int base, int length, unsigned int value);
++unsigned int bitfield_get(unsigned int bf, int base, int length);
+--- a/dump.c
++++ b/dump.c
+@@ -61,16 +61,16 @@
+ // Global Constants
+ //
+ NAMES plist[] = {
+- "Drvr", "Apple_Driver",
+- "Dr43", "Apple_Driver43",
+- "Free", "Apple_Free",
+- " HFS", "Apple_HFS",
+- " MFS", "Apple_MFS",
+- "PDOS", "Apple_PRODOS",
+- "junk", "Apple_Scratch",
+- "unix", "Apple_UNIX_SVR2",
+- " map", "Apple_partition_map",
+- 0, 0
++ {"Drvr"}, {"Apple_Driver"},
++ {"Dr43"}, {"Apple_Driver43"},
++ {"Free"}, {"Apple_Free"},
++ {" HFS"}, {"Apple_HFS"},
++ {" MFS"}, {"Apple_MFS"},
++ {"PDOS"}, {"Apple_PRODOS"},
++ {"junk"}, {"Apple_Scratch"},
++ {"unix"}, {"Apple_UNIX_SVR2"},
++ {" map"}, {"Apple_partition_map"},
++ {0}, {0}
+ };
+
+ const char * kStringEmpty = "";
+@@ -162,10 +162,10 @@
+ }
+ #ifdef __mc68000__
+ printf("%*s type name "
+- "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j, "length", j, "base");
++ "%*s %-*s ( size ) system\n", (int)strlen(map->name)+1, "#", j, "length", j, "base");
+ #else
+ printf("%*s type name "
+- "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j, "length", j, "base");
++ "%*s %-*s ( size ) system\n", (int)strlen(map->name)+1, "#", j, "length", j, "base");
+ #endif
+
+ /* Grok devfs names. (courtesy Colin Walters)*/
+@@ -199,7 +199,6 @@
+ partition_map_header *map;
+ int j;
+ DPME *p;
+- BZB *bp;
+ char *s;
+ #ifdef __mc68000__
+ int aflag = 1;
+@@ -222,13 +221,13 @@
+ }
+ }
+ #ifdef __mc68000__
+- printf("%s%-2d %.4s %-12.12s ", dev, entry->disk_address, s, p->dpme_name);
++ printf("%s%-2d %.4s %-12.12s ", dev, (int)entry->disk_address, s, p->dpme_name);
+ #else
+- printf("%s%-4d %.4s %-18.32s ", dev, entry->disk_address, s, p->dpme_name);
++ printf("%s%-4d %.4s %-18.32s ", dev, (int)entry->disk_address, s, p->dpme_name);
+ #endif
+ } else {
+ printf("%s%-4d %20.32s %-18.32s ", dev,
+- entry->disk_address, p->dpme_type, p->dpme_name);
++ (int)entry->disk_address, p->dpme_type, p->dpme_name);
+ }
+
+ if (pflag) {
+@@ -312,7 +311,6 @@
+ int i;
+ int fd;
+ DPME * data;
+- long t;
+
+ data = (DPME *) malloc(PBLOCK_SIZE);
+ if (data == NULL) {
+@@ -380,7 +378,7 @@
+ printf("Header:\n");
+ printf("fd=%d (%s)\n", map->fd, (map->regular_file)?"file":"device");
+ printf("map %d blocks out of %d, media %u blocks\n",
+- map->blocks_in_map, map->maximum_in_map, map->media_size);
++ map->blocks_in_map, map->maximum_in_map, (unsigned int)map->media_size);
+ printf("Map is%s writeable", (map->writeable)?kStringEmpty:kStringNot);
+ printf(", but%s changed\n", (map->changed)?kStringEmpty:kStringNot);
+ printf("\n");
+@@ -424,7 +422,7 @@
+ for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) {
+ p = entry->data;
+ printf("%2d: %20.32s ",
+- entry->disk_address, p->dpme_type);
++ (int)entry->disk_address, p->dpme_type);
+ printf("%7u @ %-7u ", p->dpme_pblocks, p->dpme_pblock_start);
+ printf("%c%c%c%c%c%c%c%c%c%c ",
+ (dpme_valid_get(p))?'V':'v',
+@@ -447,7 +445,7 @@
+ "goto_address checksum processor\n");
+ for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) {
+ p = entry->data;
+- printf("%2d: ", entry->disk_address);
++ printf("%2d: ", (int)entry->disk_address);
+ printf("%7u ", p->dpme_boot_block);
+ printf("%7u ", p->dpme_boot_bytes);
+ printf("%8x ", p->dpme_load_addr);
+@@ -464,7 +462,7 @@
+ */
+ for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) {
+ p = entry->data;
+- printf("%2d: ", entry->disk_address);
++ printf("%2d: ", (int)entry->disk_address);
+
+ bp = (BZB *) (p->dpme_bzb);
+ j = -1;
+--- a/errors.c
++++ b/errors.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+
++#include <errno.h>
+ #include "errors.h"
+ #include "pdisk.h"
+
+@@ -113,7 +114,7 @@
+ va_end(ap);
+
+ #ifdef __linux__
+- if (value > 0) {
++ if (value > 0 && value < errno) {
+ fprintf(stderr, " (%s)\n", strerror(value));
+ } else {
+ fprintf(stderr, "\n");
+@@ -142,7 +143,7 @@
+ va_end(ap);
+
+ #ifdef __linux__
+- if (value > 0) {
++ if (value > 0 && value < errno) {
+ fprintf(stderr, " (%s)\n", strerror(value));
+ } else {
+ fprintf(stderr, "\n");
+--- a/fdisk.c
++++ b/fdisk.c
+@@ -71,12 +71,65 @@
+
+ #include <sys/ioctl.h>
+
+-typedef unsigned short kdev_t; /* BAD hack; kdev_t is not exported */
+-
+ #include "kernel-defs.h"
+
+ #include "fdisk.h"
+
++/* ----------- */
++#define _PPC64_TYPES_H
++#define BITS_PER_LONG 64
++
++typedef __signed__ char __s8;
++typedef signed char s8;
++typedef unsigned char u8;
++typedef unsigned char __u8;
++
++typedef __signed__ short __s16;
++typedef signed short s16;
++/*typedef unsigned short __u16;*/
++typedef unsigned short u16;
++
++typedef __signed__ int __s32;
++typedef signed int s32;
++/*typedef unsigned int __u32;*/
++typedef unsigned int u32;
++
++typedef __signed__ long __s64;
++typedef signed long s64;
++typedef unsigned long __u64;
++typedef unsigned long u64;
++
++typedef struct {
++ __u32 u[4];
++} __attribute((aligned(16))) __vector128;
++
++typedef __vector128 vector128;
++
++typedef u32 dma_addr_t;
++typedef u64 dma64_addr_t;
++
++typedef struct {
++ unsigned long entry;
++ unsigned long toc;
++ unsigned long env;
++} func_descr_t;
++
++typedef unsigned int umode_t;
++
++#define BITS_TO_LONGS(bits) \
++ (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
++#define DECLARE_BITMAP(name,bits) \
++ unsigned long name[BITS_TO_LONGS(bits)]
++#define CLEAR_BITMAP(name,bits) \
++ memset(name, 0, BITS_TO_LONGS(bits)*sizeof(unsigned long))
++
++/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */
++#define HDIO_GETGEO 0x0301 /* get device geometry */
++
++#define BLKRRPART _IO(0x12,95) /* re-read partition table */
++
++/* ---------- */
++
+ #define hex_val(c) ({ \
+ char _c = (c); \
+ isdigit(_c) ? _c - '0' : \
+@@ -1416,7 +1469,7 @@
+ }
+ }
+
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ if (argc > 3)
+ fatal(usage);
+--- a/fdisklabel.c
++++ b/fdisklabel.c
+@@ -35,6 +35,7 @@
+ SUCH DAMAGE.
+ */
+
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -47,6 +48,8 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+
++#include <asm/types.h>
++
+ #include "kernel-defs.h"
+
+ #include "fdisk.h"
+@@ -263,8 +266,8 @@
+ fprintf(f, "type: %s\n", bsd_dktypenames[lp->d_type]);
+ else
+ fprintf(f, "type: %d\n", lp->d_type);
+- fprintf(f, "disk: %.*s\n", sizeof(lp->d_typename), lp->d_typename);
+- fprintf(f, "label: %.*s\n", sizeof(lp->d_packname), lp->d_packname);
++ fprintf(f, "disk: %.*s\n", (int)sizeof(lp->d_typename), lp->d_typename);
++ fprintf(f, "label: %.*s\n", (int)sizeof(lp->d_packname), lp->d_packname);
+ fprintf(f, "flags:");
+ if (lp->d_flags & BSD_D_REMOVABLE)
+ fprintf(f, " removable");
+@@ -273,17 +276,17 @@
+ if (lp->d_flags & BSD_D_BADSECT)
+ fprintf(f, " badsect");
+ fprintf(f, "\n");
+- fprintf(f, "bytes/sector: %d\n", lp->d_secsize);
+- fprintf(f, "sectors/track: %d\n", lp->d_nsectors);
+- fprintf(f, "tracks/cylinder: %d\n", lp->d_ntracks);
+- fprintf(f, "sectors/cylinder: %d\n", lp->d_secpercyl);
+- fprintf(f, "cylinders: %d\n", lp->d_ncylinders);
++ fprintf(f, "bytes/sector: %d\n", (int)lp->d_secsize);
++ fprintf(f, "sectors/track: %d\n", (int)lp->d_nsectors);
++ fprintf(f, "tracks/cylinder: %d\n", (int)lp->d_ntracks);
++ fprintf(f, "sectors/cylinder: %d\n", (int)lp->d_secpercyl);
++ fprintf(f, "cylinders: %d\n", (int)lp->d_ncylinders);
+ fprintf(f, "rpm: %d\n", lp->d_rpm);
+ fprintf(f, "interleave: %d\n", lp->d_interleave);
+ fprintf(f, "trackskew: %d\n", lp->d_trackskew);
+ fprintf(f, "cylinderskew: %d\n", lp->d_cylskew);
+- fprintf(f, "headswitch: %d\t\t# milliseconds\n", lp->d_headswitch);
+- fprintf(f, "track-to-track seek: %d\t# milliseconds\n", lp->d_trkseek);
++ fprintf(f, "headswitch: %d\t\t# milliseconds\n", (int)lp->d_headswitch);
++ fprintf(f, "track-to-track seek: %d\t# milliseconds\n", (int)lp->d_trkseek);
+ fprintf(f, "drivedata: ");
+ for (i = NDDATA - 1; i >= 0; i--)
+ if (lp->d_drivedata[i])
+@@ -291,7 +294,7 @@
+ if (i < 0)
+ i = 0;
+ for (j = 0; j <= i; j++)
+- fprintf(f, "%d ", lp->d_drivedata[j]);
++ fprintf(f, "%d ", (int)lp->d_drivedata[j]);
+ }
+ fprintf (f, "\n%d partitions:\n", lp->d_npartitions);
+ fprintf (f, "# size offset fstype [fsize bsize cpg]\n");
+@@ -299,7 +302,7 @@
+ for (i = 0; i < lp->d_npartitions; i++, pp++) {
+ if (pp->p_size) {
+ fprintf(f, " %c: %8d %8d ", 'a' + i,
+- pp->p_size, pp->p_offset);
++ (int)pp->p_size, (int)pp->p_offset);
+ if ((unsigned) pp->p_fstype < BSD_FSMAXTYPES)
+ fprintf(f, "%8.8s", bsd_fstypes[pp->p_fstype].name);
+ else
+@@ -308,12 +311,12 @@
+ {
+ case BSD_FS_UNUSED:
+ fprintf(f, " %5d %5d %5.5s ",
+- pp->p_fsize, pp->p_fsize * pp->p_frag, "");
++ (int)pp->p_fsize, (int)pp->p_fsize * pp->p_frag, "");
+ break;
+
+ case BSD_FS_BSDFFS:
+ fprintf(f, " %5d %5d %5d ",
+- pp->p_fsize, pp->p_fsize * pp->p_frag,
++ (int)pp->p_fsize, (int)pp->p_fsize * pp->p_frag,
+ pp->p_cpg);
+ break;
+
+@@ -323,21 +326,21 @@
+ }
+ fprintf(f, "\t# (Cyl. %4d",
+ #if 0
+- pp->p_offset / lp->d_secpercyl); /* differs from Linux fdisk */
++ (int)(pp->p_offset / lp->d_secpercyl)); /* differs from Linux fdisk */
+ #else
+- pp->p_offset / lp->d_secpercyl + 1);
++ (int)(pp->p_offset / lp->d_secpercyl + 1));
+ #endif
+ if (pp->p_offset % lp->d_secpercyl)
+ putc('*', f);
+ else
+ putc(' ', f);
+ fprintf(f, "- %d",
+- (pp->p_offset +
++ (int)((pp->p_offset +
+ pp->p_size + lp->d_secpercyl - 1) /
+ #if 0
+- lp->d_secpercyl - 1); /* differs from Linux fdisk */
++ lp->d_secpercyl - 1)); /* differs from Linux fdisk */
+ #else
+- lp->d_secpercyl);
++ lp->d_secpercyl));
+ #endif
+ if (pp->p_size % lp->d_secpercyl)
+ putc('*', f);
+--- a/io.c
++++ b/io.c
+@@ -33,8 +33,10 @@
+ #else
+ #ifdef __GLIBC__
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #endif
+ #endif
++#include <linux/unistd.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdarg.h>
+@@ -466,7 +468,7 @@
+ long t;
+
+ if (rflag) {
+- printf("Can't write block %u to file", num);
++ printf("Can't write block %u to file", (unsigned int)num);
+ return 0;
+ }
+ #ifndef __linux__
+--- a/partition_map.c
++++ b/partition_map.c
+@@ -105,7 +105,6 @@
+ int fd;
+ partition_map_header * map;
+ int writeable;
+- unsigned long length;
+ #ifdef __linux__
+ struct stat info;
+ #endif
+@@ -402,9 +401,7 @@
+ {
+ int fd;
+ partition_map_header * map;
+- unsigned long length;
+ DPME *data;
+- int ok;
+ unsigned long number;
+ #ifdef __linux__
+ struct stat info;
+@@ -433,13 +430,13 @@
+ map->maximum_in_map = -1;
+
+ number = compute_device_size(fd);
+- printf("size of 'device' is %u blocks: ", number);
++ printf("size of 'device' is %u blocks: ", (unsigned int)number);
+ flush_to_newline(0);
+ get_number_argument("what should be the size? ", (long *)&number, number);
+ if (number < 4) {
+ number = 4;
+ }
+- printf("new size of 'device' is %u blocks\n", number);
++ printf("new size of 'device' is %u blocks\n", (unsigned int)number);
+ map->media_size = number;
+
+ #ifdef __linux__
+--- a/pdisk.c
++++ b/pdisk.c
+@@ -437,7 +437,6 @@
+ {
+ long base;
+ long length;
+- long mult;
+ char *name;
+ char *type_name;
+
+@@ -599,7 +598,6 @@
+ void
+ do_reorder(partition_map_header *map)
+ {
+- partition_map * cur;
+ long old_index;
+ long index;
+
projects / gentoo.git / commitdiff