1 |
commit: 9f0e75e841221467840d5533120cb826f842c1ad |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jan 25 18:25:56 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 29 11:13:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0e75e8 |
7 |
|
8 |
sys-fs/mac-fdisk: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/14444 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
.../mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch | 481 --------------------- |
15 |
1 file changed, 481 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch |
18 |
deleted file mode 100644 |
19 |
index 4fb1617eec8..00000000000 |
20 |
--- a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch |
21 |
+++ /dev/null |
22 |
@@ -1,481 +0,0 @@ |
23 |
---- a/bitfield.c |
24 |
-+++ b/bitfield.c |
25 |
-@@ -67,13 +67,12 @@ |
26 |
- // |
27 |
- // Routines |
28 |
- // |
29 |
--unsigned long |
30 |
--bitfield_set(unsigned long *bf, int base, int length, unsigned long value) |
31 |
-+unsigned int |
32 |
-+bitfield_set(unsigned int *bf, int base, int length, unsigned int value) |
33 |
- { |
34 |
-- unsigned long t; |
35 |
-- unsigned long m; |
36 |
-+ unsigned int t; |
37 |
-+ unsigned int m; |
38 |
- int s; |
39 |
-- int i; |
40 |
- |
41 |
- // compute shift & mask, coerce value to correct number of bits, |
42 |
- // zap the old bits and stuff the new value |
43 |
-@@ -86,12 +85,11 @@ |
44 |
- } |
45 |
- |
46 |
- |
47 |
--unsigned long |
48 |
--bitfield_get(unsigned long bf, int base, int length) |
49 |
-+unsigned int |
50 |
-+bitfield_get(unsigned int bf, int base, int length) |
51 |
- { |
52 |
-- unsigned long m; |
53 |
-+ unsigned int m; |
54 |
- int s; |
55 |
-- int i; |
56 |
- |
57 |
- // compute shift & mask |
58 |
- // return the correct number of bits (shifted to low end) |
59 |
---- a/bitfield.h |
60 |
-+++ b/bitfield.h |
61 |
-@@ -63,5 +63,5 @@ |
62 |
- // |
63 |
- // Forward declarations |
64 |
- // |
65 |
--unsigned long bitfield_set(unsigned long *bf, int base, int length, unsigned long value); |
66 |
--unsigned long bitfield_get(unsigned long bf, int base, int length); |
67 |
-+unsigned int bitfield_set(unsigned int *bf, int base, int length, unsigned int value); |
68 |
-+unsigned int bitfield_get(unsigned int bf, int base, int length); |
69 |
---- a/dpme.h |
70 |
-+++ b/dpme.h |
71 |
-@@ -61,7 +61,7 @@ |
72 |
- // |
73 |
- typedef unsigned char u8; |
74 |
- typedef unsigned short u16; |
75 |
--typedef unsigned long u32; |
76 |
-+typedef unsigned int u32; |
77 |
- |
78 |
- |
79 |
- // Physical block zero of the disk has this format |
80 |
-@@ -113,10 +113,10 @@ |
81 |
- #endif |
82 |
- u32 dpme_boot_block ; |
83 |
- u32 dpme_boot_bytes ; |
84 |
-- u8 *dpme_load_addr ; |
85 |
-- u8 *dpme_load_addr_2 ; |
86 |
-- u8 *dpme_goto_addr ; |
87 |
-- u8 *dpme_goto_addr_2 ; |
88 |
-+ u32 dpme_load_addr ; |
89 |
-+ u32 dpme_load_addr_2 ; |
90 |
-+ u32 dpme_goto_addr ; |
91 |
-+ u32 dpme_goto_addr_2 ; |
92 |
- u32 dpme_checksum ; |
93 |
- char dpme_process_id[16] ; |
94 |
- u32 dpme_boot_args[32] ; |
95 |
---- a/dump.c |
96 |
-+++ b/dump.c |
97 |
-@@ -61,16 +61,16 @@ |
98 |
- // Global Constants |
99 |
- // |
100 |
- NAMES plist[] = { |
101 |
-- "Drvr", "Apple_Driver", |
102 |
-- "Dr43", "Apple_Driver43", |
103 |
-- "Free", "Apple_Free", |
104 |
-- " HFS", "Apple_HFS", |
105 |
-- " MFS", "Apple_MFS", |
106 |
-- "PDOS", "Apple_PRODOS", |
107 |
-- "junk", "Apple_Scratch", |
108 |
-- "unix", "Apple_UNIX_SVR2", |
109 |
-- " map", "Apple_partition_map", |
110 |
-- 0, 0 |
111 |
-+ {"Drvr"}, {"Apple_Driver"}, |
112 |
-+ {"Dr43"}, {"Apple_Driver43"}, |
113 |
-+ {"Free"}, {"Apple_Free"}, |
114 |
-+ {" HFS"}, {"Apple_HFS"}, |
115 |
-+ {" MFS"}, {"Apple_MFS"}, |
116 |
-+ {"PDOS"}, {"Apple_PRODOS"}, |
117 |
-+ {"junk"}, {"Apple_Scratch"}, |
118 |
-+ {"unix"}, {"Apple_UNIX_SVR2"}, |
119 |
-+ {" map"}, {"Apple_partition_map"}, |
120 |
-+ {0}, {0} |
121 |
- }; |
122 |
- |
123 |
- const char * kStringEmpty = ""; |
124 |
-@@ -162,10 +162,10 @@ |
125 |
- } |
126 |
- #ifdef __mc68000__ |
127 |
- printf("%*s type name " |
128 |
-- "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j, "length", j, "base"); |
129 |
-+ "%*s %-*s ( size ) system\n", (int)strlen(map->name)+1, "#", j, "length", j, "base"); |
130 |
- #else |
131 |
- printf("%*s type name " |
132 |
-- "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j, "length", j, "base"); |
133 |
-+ "%*s %-*s ( size ) system\n", (int)strlen(map->name)+1, "#", j, "length", j, "base"); |
134 |
- #endif |
135 |
- |
136 |
- /* Grok devfs names. (courtesy Colin Walters)*/ |
137 |
-@@ -199,7 +199,6 @@ |
138 |
- partition_map_header *map; |
139 |
- int j; |
140 |
- DPME *p; |
141 |
-- BZB *bp; |
142 |
- char *s; |
143 |
- #ifdef __mc68000__ |
144 |
- int aflag = 1; |
145 |
-@@ -222,13 +221,13 @@ |
146 |
- } |
147 |
- } |
148 |
- #ifdef __mc68000__ |
149 |
-- printf("%s%-2d %.4s %-12.12s ", dev, entry->disk_address, s, p->dpme_name); |
150 |
-+ printf("%s%-2d %.4s %-12.12s ", dev, (int)entry->disk_address, s, p->dpme_name); |
151 |
- #else |
152 |
-- printf("%s%-4d %.4s %-18.32s ", dev, entry->disk_address, s, p->dpme_name); |
153 |
-+ printf("%s%-4d %.4s %-18.32s ", dev, (int)entry->disk_address, s, p->dpme_name); |
154 |
- #endif |
155 |
- } else { |
156 |
- printf("%s%-4d %20.32s %-18.32s ", dev, |
157 |
-- entry->disk_address, p->dpme_type, p->dpme_name); |
158 |
-+ (int)entry->disk_address, p->dpme_type, p->dpme_name); |
159 |
- } |
160 |
- |
161 |
- if (pflag) { |
162 |
-@@ -312,7 +311,6 @@ |
163 |
- int i; |
164 |
- int fd; |
165 |
- DPME * data; |
166 |
-- long t; |
167 |
- |
168 |
- data = (DPME *) malloc(PBLOCK_SIZE); |
169 |
- if (data == NULL) { |
170 |
-@@ -380,7 +378,7 @@ |
171 |
- printf("Header:\n"); |
172 |
- printf("fd=%d (%s)\n", map->fd, (map->regular_file)?"file":"device"); |
173 |
- printf("map %d blocks out of %d, media %u blocks\n", |
174 |
-- map->blocks_in_map, map->maximum_in_map, map->media_size); |
175 |
-+ map->blocks_in_map, map->maximum_in_map, (unsigned int)map->media_size); |
176 |
- printf("Map is%s writeable", (map->writeable)?kStringEmpty:kStringNot); |
177 |
- printf(", but%s changed\n", (map->changed)?kStringEmpty:kStringNot); |
178 |
- printf("\n"); |
179 |
-@@ -424,7 +422,7 @@ |
180 |
- for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) { |
181 |
- p = entry->data; |
182 |
- printf("%2d: %20.32s ", |
183 |
-- entry->disk_address, p->dpme_type); |
184 |
-+ (int)entry->disk_address, p->dpme_type); |
185 |
- printf("%7u @ %-7u ", p->dpme_pblocks, p->dpme_pblock_start); |
186 |
- printf("%c%c%c%c%c%c%c%c%c%c ", |
187 |
- (dpme_valid_get(p))?'V':'v', |
188 |
-@@ -447,7 +445,7 @@ |
189 |
- "goto_address checksum processor\n"); |
190 |
- for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) { |
191 |
- p = entry->data; |
192 |
-- printf("%2d: ", entry->disk_address); |
193 |
-+ printf("%2d: ", (int)entry->disk_address); |
194 |
- printf("%7u ", p->dpme_boot_block); |
195 |
- printf("%7u ", p->dpme_boot_bytes); |
196 |
- printf("%8x ", p->dpme_load_addr); |
197 |
-@@ -464,7 +462,7 @@ |
198 |
- */ |
199 |
- for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) { |
200 |
- p = entry->data; |
201 |
-- printf("%2d: ", entry->disk_address); |
202 |
-+ printf("%2d: ", (int)entry->disk_address); |
203 |
- |
204 |
- bp = (BZB *) (p->dpme_bzb); |
205 |
- j = -1; |
206 |
---- a/errors.c |
207 |
-+++ b/errors.c |
208 |
-@@ -30,6 +30,7 @@ |
209 |
- #include <string.h> |
210 |
- #include <stdarg.h> |
211 |
- |
212 |
-+#include <errno.h> |
213 |
- #include "errors.h" |
214 |
- #include "pdisk.h" |
215 |
- |
216 |
-@@ -113,7 +114,7 @@ |
217 |
- va_end(ap); |
218 |
- |
219 |
- #ifdef __linux__ |
220 |
-- if (value > 0) { |
221 |
-+ if (value > 0 && value < errno) { |
222 |
- fprintf(stderr, " (%s)\n", strerror(value)); |
223 |
- } else { |
224 |
- fprintf(stderr, "\n"); |
225 |
-@@ -142,7 +143,7 @@ |
226 |
- va_end(ap); |
227 |
- |
228 |
- #ifdef __linux__ |
229 |
-- if (value > 0) { |
230 |
-+ if (value > 0 && value < errno) { |
231 |
- fprintf(stderr, " (%s)\n", strerror(value)); |
232 |
- } else { |
233 |
- fprintf(stderr, "\n"); |
234 |
---- a/fdisk.c |
235 |
-+++ b/fdisk.c |
236 |
-@@ -71,12 +71,65 @@ |
237 |
- |
238 |
- #include <sys/ioctl.h> |
239 |
- |
240 |
--typedef unsigned short kdev_t; /* BAD hack; kdev_t is not exported */ |
241 |
-- |
242 |
- #include "kernel-defs.h" |
243 |
- |
244 |
- #include "fdisk.h" |
245 |
- |
246 |
-+/* ----------- */ |
247 |
-+#define _PPC64_TYPES_H |
248 |
-+#define BITS_PER_LONG 64 |
249 |
-+ |
250 |
-+typedef __signed__ char __s8; |
251 |
-+typedef signed char s8; |
252 |
-+typedef unsigned char u8; |
253 |
-+typedef unsigned char __u8; |
254 |
-+ |
255 |
-+typedef __signed__ short __s16; |
256 |
-+typedef signed short s16; |
257 |
-+/*typedef unsigned short __u16;*/ |
258 |
-+typedef unsigned short u16; |
259 |
-+ |
260 |
-+typedef __signed__ int __s32; |
261 |
-+typedef signed int s32; |
262 |
-+/*typedef unsigned int __u32;*/ |
263 |
-+typedef unsigned int u32; |
264 |
-+ |
265 |
-+typedef __signed__ long __s64; |
266 |
-+typedef signed long s64; |
267 |
-+typedef unsigned long __u64; |
268 |
-+typedef unsigned long u64; |
269 |
-+ |
270 |
-+typedef struct { |
271 |
-+ __u32 u[4]; |
272 |
-+} __attribute((aligned(16))) __vector128; |
273 |
-+ |
274 |
-+typedef __vector128 vector128; |
275 |
-+ |
276 |
-+typedef u32 dma_addr_t; |
277 |
-+typedef u64 dma64_addr_t; |
278 |
-+ |
279 |
-+typedef struct { |
280 |
-+ unsigned long entry; |
281 |
-+ unsigned long toc; |
282 |
-+ unsigned long env; |
283 |
-+} func_descr_t; |
284 |
-+ |
285 |
-+typedef unsigned int umode_t; |
286 |
-+ |
287 |
-+#define BITS_TO_LONGS(bits) \ |
288 |
-+ (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) |
289 |
-+#define DECLARE_BITMAP(name,bits) \ |
290 |
-+ unsigned long name[BITS_TO_LONGS(bits)] |
291 |
-+#define CLEAR_BITMAP(name,bits) \ |
292 |
-+ memset(name, 0, BITS_TO_LONGS(bits)*sizeof(unsigned long)) |
293 |
-+ |
294 |
-+/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */ |
295 |
-+#define HDIO_GETGEO 0x0301 /* get device geometry */ |
296 |
-+ |
297 |
-+#define BLKRRPART _IO(0x12,95) /* re-read partition table */ |
298 |
-+ |
299 |
-+/* ---------- */ |
300 |
-+ |
301 |
- #define hex_val(c) ({ \ |
302 |
- char _c = (c); \ |
303 |
- isdigit(_c) ? _c - '0' : \ |
304 |
-@@ -1416,7 +1469,7 @@ |
305 |
- } |
306 |
- } |
307 |
- |
308 |
--void main(int argc, char **argv) |
309 |
-+int main(int argc, char **argv) |
310 |
- { |
311 |
- if (argc > 3) |
312 |
- fatal(usage); |
313 |
---- a/fdisklabel.c |
314 |
-+++ b/fdisklabel.c |
315 |
-@@ -35,6 +35,7 @@ |
316 |
- SUCH DAMAGE. |
317 |
- */ |
318 |
- |
319 |
-+#include <sys/types.h> |
320 |
- #include <unistd.h> |
321 |
- #include <stdio.h> |
322 |
- #include <stdlib.h> |
323 |
-@@ -47,6 +48,8 @@ |
324 |
- #include <sys/ioctl.h> |
325 |
- #include <sys/param.h> |
326 |
- |
327 |
-+#include <asm/types.h> |
328 |
-+ |
329 |
- #include "kernel-defs.h" |
330 |
- |
331 |
- #include "fdisk.h" |
332 |
-@@ -263,8 +266,8 @@ |
333 |
- fprintf(f, "type: %s\n", bsd_dktypenames[lp->d_type]); |
334 |
- else |
335 |
- fprintf(f, "type: %d\n", lp->d_type); |
336 |
-- fprintf(f, "disk: %.*s\n", sizeof(lp->d_typename), lp->d_typename); |
337 |
-- fprintf(f, "label: %.*s\n", sizeof(lp->d_packname), lp->d_packname); |
338 |
-+ fprintf(f, "disk: %.*s\n", (int)sizeof(lp->d_typename), lp->d_typename); |
339 |
-+ fprintf(f, "label: %.*s\n", (int)sizeof(lp->d_packname), lp->d_packname); |
340 |
- fprintf(f, "flags:"); |
341 |
- if (lp->d_flags & BSD_D_REMOVABLE) |
342 |
- fprintf(f, " removable"); |
343 |
-@@ -273,17 +276,17 @@ |
344 |
- if (lp->d_flags & BSD_D_BADSECT) |
345 |
- fprintf(f, " badsect"); |
346 |
- fprintf(f, "\n"); |
347 |
-- fprintf(f, "bytes/sector: %d\n", lp->d_secsize); |
348 |
-- fprintf(f, "sectors/track: %d\n", lp->d_nsectors); |
349 |
-- fprintf(f, "tracks/cylinder: %d\n", lp->d_ntracks); |
350 |
-- fprintf(f, "sectors/cylinder: %d\n", lp->d_secpercyl); |
351 |
-- fprintf(f, "cylinders: %d\n", lp->d_ncylinders); |
352 |
-+ fprintf(f, "bytes/sector: %d\n", (int)lp->d_secsize); |
353 |
-+ fprintf(f, "sectors/track: %d\n", (int)lp->d_nsectors); |
354 |
-+ fprintf(f, "tracks/cylinder: %d\n", (int)lp->d_ntracks); |
355 |
-+ fprintf(f, "sectors/cylinder: %d\n", (int)lp->d_secpercyl); |
356 |
-+ fprintf(f, "cylinders: %d\n", (int)lp->d_ncylinders); |
357 |
- fprintf(f, "rpm: %d\n", lp->d_rpm); |
358 |
- fprintf(f, "interleave: %d\n", lp->d_interleave); |
359 |
- fprintf(f, "trackskew: %d\n", lp->d_trackskew); |
360 |
- fprintf(f, "cylinderskew: %d\n", lp->d_cylskew); |
361 |
-- fprintf(f, "headswitch: %d\t\t# milliseconds\n", lp->d_headswitch); |
362 |
-- fprintf(f, "track-to-track seek: %d\t# milliseconds\n", lp->d_trkseek); |
363 |
-+ fprintf(f, "headswitch: %d\t\t# milliseconds\n", (int)lp->d_headswitch); |
364 |
-+ fprintf(f, "track-to-track seek: %d\t# milliseconds\n", (int)lp->d_trkseek); |
365 |
- fprintf(f, "drivedata: "); |
366 |
- for (i = NDDATA - 1; i >= 0; i--) |
367 |
- if (lp->d_drivedata[i]) |
368 |
-@@ -291,7 +294,7 @@ |
369 |
- if (i < 0) |
370 |
- i = 0; |
371 |
- for (j = 0; j <= i; j++) |
372 |
-- fprintf(f, "%d ", lp->d_drivedata[j]); |
373 |
-+ fprintf(f, "%d ", (int)lp->d_drivedata[j]); |
374 |
- } |
375 |
- fprintf (f, "\n%d partitions:\n", lp->d_npartitions); |
376 |
- fprintf (f, "# size offset fstype [fsize bsize cpg]\n"); |
377 |
-@@ -299,7 +302,7 @@ |
378 |
- for (i = 0; i < lp->d_npartitions; i++, pp++) { |
379 |
- if (pp->p_size) { |
380 |
- fprintf(f, " %c: %8d %8d ", 'a' + i, |
381 |
-- pp->p_size, pp->p_offset); |
382 |
-+ (int)pp->p_size, (int)pp->p_offset); |
383 |
- if ((unsigned) pp->p_fstype < BSD_FSMAXTYPES) |
384 |
- fprintf(f, "%8.8s", bsd_fstypes[pp->p_fstype].name); |
385 |
- else |
386 |
-@@ -308,12 +311,12 @@ |
387 |
- { |
388 |
- case BSD_FS_UNUSED: |
389 |
- fprintf(f, " %5d %5d %5.5s ", |
390 |
-- pp->p_fsize, pp->p_fsize * pp->p_frag, ""); |
391 |
-+ (int)pp->p_fsize, (int)pp->p_fsize * pp->p_frag, ""); |
392 |
- break; |
393 |
- |
394 |
- case BSD_FS_BSDFFS: |
395 |
- fprintf(f, " %5d %5d %5d ", |
396 |
-- pp->p_fsize, pp->p_fsize * pp->p_frag, |
397 |
-+ (int)pp->p_fsize, (int)pp->p_fsize * pp->p_frag, |
398 |
- pp->p_cpg); |
399 |
- break; |
400 |
- |
401 |
-@@ -323,21 +326,21 @@ |
402 |
- } |
403 |
- fprintf(f, "\t# (Cyl. %4d", |
404 |
- #if 0 |
405 |
-- pp->p_offset / lp->d_secpercyl); /* differs from Linux fdisk */ |
406 |
-+ (int)(pp->p_offset / lp->d_secpercyl)); /* differs from Linux fdisk */ |
407 |
- #else |
408 |
-- pp->p_offset / lp->d_secpercyl + 1); |
409 |
-+ (int)(pp->p_offset / lp->d_secpercyl + 1)); |
410 |
- #endif |
411 |
- if (pp->p_offset % lp->d_secpercyl) |
412 |
- putc('*', f); |
413 |
- else |
414 |
- putc(' ', f); |
415 |
- fprintf(f, "- %d", |
416 |
-- (pp->p_offset + |
417 |
-+ (int)((pp->p_offset + |
418 |
- pp->p_size + lp->d_secpercyl - 1) / |
419 |
- #if 0 |
420 |
-- lp->d_secpercyl - 1); /* differs from Linux fdisk */ |
421 |
-+ lp->d_secpercyl - 1)); /* differs from Linux fdisk */ |
422 |
- #else |
423 |
-- lp->d_secpercyl); |
424 |
-+ lp->d_secpercyl)); |
425 |
- #endif |
426 |
- if (pp->p_size % lp->d_secpercyl) |
427 |
- putc('*', f); |
428 |
---- a/io.c |
429 |
-+++ b/io.c |
430 |
-@@ -33,8 +33,10 @@ |
431 |
- #else |
432 |
- #ifdef __GLIBC__ |
433 |
- #include <sys/types.h> |
434 |
-+#include <sys/stat.h> |
435 |
- #endif |
436 |
- #endif |
437 |
-+#include <linux/unistd.h> |
438 |
- #include <unistd.h> |
439 |
- #include <string.h> |
440 |
- #include <stdarg.h> |
441 |
-@@ -466,7 +468,7 @@ |
442 |
- long t; |
443 |
- |
444 |
- if (rflag) { |
445 |
-- printf("Can't write block %u to file", num); |
446 |
-+ printf("Can't write block %u to file", (unsigned int)num); |
447 |
- return 0; |
448 |
- } |
449 |
- #ifndef __linux__ |
450 |
---- a/partition_map.c |
451 |
-+++ b/partition_map.c |
452 |
-@@ -105,7 +105,6 @@ |
453 |
- int fd; |
454 |
- partition_map_header * map; |
455 |
- int writeable; |
456 |
-- unsigned long length; |
457 |
- #ifdef __linux__ |
458 |
- struct stat info; |
459 |
- #endif |
460 |
-@@ -402,9 +401,7 @@ |
461 |
- { |
462 |
- int fd; |
463 |
- partition_map_header * map; |
464 |
-- unsigned long length; |
465 |
- DPME *data; |
466 |
-- int ok; |
467 |
- unsigned long number; |
468 |
- #ifdef __linux__ |
469 |
- struct stat info; |
470 |
-@@ -433,13 +430,13 @@ |
471 |
- map->maximum_in_map = -1; |
472 |
- |
473 |
- number = compute_device_size(fd); |
474 |
-- printf("size of 'device' is %u blocks: ", number); |
475 |
-+ printf("size of 'device' is %u blocks: ", (unsigned int)number); |
476 |
- flush_to_newline(0); |
477 |
- get_number_argument("what should be the size? ", (long *)&number, number); |
478 |
- if (number < 4) { |
479 |
- number = 4; |
480 |
- } |
481 |
-- printf("new size of 'device' is %u blocks\n", number); |
482 |
-+ printf("new size of 'device' is %u blocks\n", (unsigned int)number); |
483 |
- map->media_size = number; |
484 |
- |
485 |
- #ifdef __linux__ |
486 |
---- a/pdisk.c |
487 |
-+++ b/pdisk.c |
488 |
-@@ -437,7 +437,6 @@ |
489 |
- { |
490 |
- long base; |
491 |
- long length; |
492 |
-- long mult; |
493 |
- char *name; |
494 |
- char *type_name; |
495 |
- |
496 |
-@@ -599,7 +598,6 @@ |
497 |
- void |
498 |
- do_reorder(partition_map_header *map) |
499 |
- { |
500 |
-- partition_map * cur; |
501 |
- long old_index; |
502 |
- long index; |
503 |
- |