/[magellan-source]/trunk/mkinitrd-magellan/busybox/util-linux/fdisk_sgi.c

Diff of /trunk/mkinitrd-magellan/busybox/util-linux/fdisk_sgi.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 1
- #if ENABLE_FEATURE_SGI_LABEL
- #define SGI_DEBUG 0
  /*
   * Copyright (C) Andreas Neuper, Sep 1998.
-  *      This file may be modified and redistributed under
+  *
-  *      the terms of the GNU Public License.
+  * Licensed under GPLv2, see file LICENSE in this tarball for details.
   */
+ #if ENABLE_FEATURE_SGI_LABEL
+ #define SGI_DEBUG 0
  #define SGI_VOLHDR      0x00
  /* 1 and 2 were used for drive types no longer supported by SGI */
  #define SGI_SWAP        0x03
 Line 36 
 struct device_parameter { /* 48 bytes */
  	unsigned short nsect;   /* sectors/tracks in cyl 0 or vol 0 */
  	unsigned short bytes;
  	unsigned short ilfact;
- 	unsigned int   flags;           /* controller flags */
+ 	unsigned int   flags;   /* controller flags */
  	unsigned int   datarate;
  	unsigned int   retries_on_error;
  	unsigned int   ms_per_word;
 Line 70 
 typedef struct {
  		unsigned int  vol_file_start;   /* number of logical block */
  		unsigned int  vol_file_size;    /* number of bytes */
  	} directory[15];
- 	struct sgi_partinfo {                  /* 16 * 12 bytes */
+ 	struct sgi_partinfo {                   /* 16 * 12 bytes */
  		unsigned int num_sectors;       /* number of blocks */
  		unsigned int start_sector;      /* must be cylinder aligned */
  		unsigned int id;
 Line 291 
 sgi_list_table(int xtra)
  	int kpi = 0;                /* kernel partition ID */
  	if (xtra) {
- 		printf("\nDisk %s (SGI disk label): %d heads, %d sectors\n"
+ 		printf("\nDisk %s (SGI disk label): %u heads, %u sectors\n"
- 			"%d cylinders, %d physical cylinders\n"
+ 			"%u cylinders, %u physical cylinders\n"
- 			"%d extra sects/cyl, interleave %d:1\n"
+ 			"%u extra sects/cyl, interleave %u:1\n"
  			"%s\n"
- 			"Units = %s of %d * 512 bytes\n\n",
+ 			"Units = %s of %u * 512 bytes\n\n",
  			disk_device, g_heads, g_sectors, g_cylinders,
  			SGI_SSWAP16(sgiparam.pcylcount),
  			SGI_SSWAP16(sgiparam.sparecyl),
 Line 304 
 sgi_list_table(int xtra)
  			str_units(PLURAL), units_per_sector);
  	} else {
  		printf("\nDisk %s (SGI disk label): "
- 			"%d heads, %d sectors, %d cylinders\n"
+ 			"%u heads, %u sectors, %u cylinders\n"
- 			"Units = %s of %d * 512 bytes\n\n",
+ 			"Units = %s of %u * 512 bytes\n\n",
  			disk_device, g_heads, g_sectors, g_cylinders,
  			str_units(PLURAL), units_per_sector );
  	}
 Line 324 
 sgi_list_table(int xtra)
  			uint32_t len = sgi_get_num_sectors(i);
  			kpi++;              /* only count nonempty partitions */
  			printf(
- 			"%2d: %s %4s %9ld %9ld %9ld  %2x  %s\n",
+ 			"%2u: %s %4s %9lu %9lu %9lu  %2x  %s\n",
  /* fdisk part number */	i+1,
  /* device */            partname(disk_device, kpi, w+3),
  /* flags */             (sgi_get_swappartition() == i) ? "swap" :
 Line 345 
 sgi_list_table(int xtra)
  			uint32_t len = SGI_SSWAP32(sgilabel->directory[i].vol_file_size);
  			unsigned char *name = sgilabel->directory[i].vol_file_name;
- 			printf("%2d: %-10s sector%5u size%8u\n",
+ 			printf("%2u: %-10s sector%5u size%8u\n",
  				i, (char*)name, (unsigned int) start, (unsigned int) len);
  		}
  	}
 Line 507 
 verify_sgi(int verbose)
  		if ((sgi_get_start_sector(Index[0]) != 0) && verbose)
  			printf("The entire disk partition should start "
  				"at block 0,\n"
- 				"not at diskblock %d\n",
+ 				"not at diskblock %u\n",
  				sgi_get_start_sector(Index[0]));
  		if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
  			if ((sgi_get_num_sectors(Index[0]) != lastblock) && verbose)
- 				printf("The entire disk partition is only %d diskblock large,\n"
+ 				printf("The entire disk partition is only %u diskblock large,\n"
- 					"but the disk is %d diskblocks long\n",
+ 					"but the disk is %u diskblocks long\n",
  					sgi_get_num_sectors(Index[0]), lastblock);
  			lastblock = sgi_get_num_sectors(Index[0]);
  	} else {
  		if (verbose)
  			printf("One Partition (#11) should cover the entire disk\n");
  		if (SGI_DEBUG > 2)
- 			printf("sysid=%d\tpartition=%d\n",
+ 			printf("sysid=%u\tpartition=%u\n",
  				sgi_get_sysid(Index[0]), Index[0]+1);
  	}
  	for (i = 1, start = 0; i < sortcount; i++) {
 Line 528 
 verify_sgi(int verbose)
  		if ((sgi_get_start_sector(Index[i]) % cylsize) != 0) {
  			if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
  				if (verbose)
- 					printf("Partition %d does not start on cylinder boundary\n",
+ 					printf("Partition %u does not start on cylinder boundary\n",
  						Index[i]+1);
  		}
  		if (sgi_get_num_sectors(Index[i]) % cylsize != 0) {
  			if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
  				if (verbose)
- 					printf("Partition %d does not end on cylinder boundary\n",
+ 					printf("Partition %u does not end on cylinder boundary\n",
  						Index[i]+1);
  		}
  		/* We cannot handle several "entire disk" entries. */
  		if (sgi_get_sysid(Index[i]) == SGI_ENTIRE_DISK) continue;
  		if (start > sgi_get_start_sector(Index[i])) {
  			if (verbose)
- 				printf("Partitions %d and %d overlap by %d sectors\n",
+ 				printf("Partitions %u and %u overlap by %u sectors\n",
  					Index[i-1]+1, Index[i]+1,
  					start - sgi_get_start_sector(Index[i]));
  			if (gap > 0) gap = -gap;
 Line 549 
 verify_sgi(int verbose)
  		}
  		if (start < sgi_get_start_sector(Index[i])) {
  			if (verbose)
- 				printf("Unused gap of %8u sectors - sectors %8u-%8u\n",
+ 				printf("Unused gap of %u sectors - sectors %u-%u\n",
  					sgi_get_start_sector(Index[i]) - start,
  					start, sgi_get_start_sector(Index[i])-1);
  			gap += sgi_get_start_sector(Index[i]) - start;
 Line 559 
 verify_sgi(int verbose)
  			   + sgi_get_num_sectors(Index[i]);
  		if (SGI_DEBUG > 1) {
  			if (verbose)
- 				printf("%2d:%12d\t%12d\t%12d\n", Index[i],
+ 				printf("%2u:%12u\t%12u\t%12u\n", Index[i],
  					sgi_get_start_sector(Index[i]),
  					sgi_get_num_sectors(Index[i]),
  					sgi_get_sysid(Index[i]));
 Line 567 
 verify_sgi(int verbose)
  	}
  	if (start < lastblock) {
  		if (verbose)
- 			printf("Unused gap of %8u sectors - sectors %8u-%8u\n",
+ 			printf("Unused gap of %u sectors - sectors %u-%u\n",
  				lastblock - start, start, lastblock-1);
  		gap += lastblock - start;
  		add2freelist(start, lastblock);
 Line 788 
 create_sgilabel(void)
  			/* otherwise print error and use truncated version */
  			g_cylinders = geometry.cylinders;
  			printf(
- "Warning: BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+ "Warning: BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %u.\n"
  "This value may be truncated for devices > 33.8 GB.\n", disk_device, g_cylinders);
  		}
  	}
 Line 799 
 create_sgilabel(void)
  				old[i].sysid = get_part_table(i)->sys_ind;
  				old[i].start = get_start_sect(get_part_table(i));
  				old[i].nsect = get_nr_sects(get_part_table(i));
- 				printf("Trying to keep parameters of partition %d\n", i);
+ 				printf("Trying to keep parameters of partition %u\n", i);
  				if (SGI_DEBUG)
- 					printf("ID=%02x\tSTART=%d\tLENGTH=%d\n",
+ 					printf("ID=%02x\tSTART=%u\tLENGTH=%u\n",
  				old[i].sysid, old[i].start, old[i].nsect);
  			}
  		}

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984