From e99da659a963ea33abab3dd1206f95718434ecdf Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 1 Aug 2011 15:19:53 +0200
Subject: [PATCH] fdisk: fix compiler warnings [-Wunused-parameter
 -Wsign-compare]

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 fdisk/fdisk.c         | 20 +++++++++-----------
 fdisk/fdiskbsdlabel.c |  3 ++-
 fdisk/fdisksgilabel.c |  2 +-
 fdisk/fdisksunlabel.c |  5 +++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index f6a2bc4d7c..038536db26 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1397,7 +1397,7 @@ read_int_sx(unsigned int low, unsigned int dflt, unsigned int high,
 	unsigned int i;
 	int default_ok = 1;
 	static char *ms = NULL;
-	static int mslen = 0;
+	static size_t mslen = 0;
 
 	if (!ms || strlen(mesg)+100 > mslen) {
 		mslen = strlen(mesg)+200;
@@ -2325,7 +2325,6 @@ add_partition(int n, int sys) {
 	int i, read = 0;
 	struct partition *p = ptes[n].part_table;
 	struct partition *q = ptes[ext_index].part_table;
-	long long llimit;
 	unsigned long long start, stop = 0, limit, temp,
 		first[partitions], last[partitions];
 
@@ -2338,12 +2337,13 @@ add_partition(int n, int sys) {
 	if (n < 4) {
 		start = sector_offset;
 		if (display_in_cyl_units || !total_number_of_sectors)
-			llimit = heads * sectors * cylinders - 1;
+			limit = heads * sectors * cylinders - 1;
 		else
-			llimit = total_number_of_sectors - 1;
-		limit = llimit;
-		if (limit != llimit)
-			limit = 0x7fffffff;
+			limit = total_number_of_sectors - 1;
+
+		if (limit > UINT_MAX)
+			limit = UINT_MAX;
+
 		if (extended_offset) {
 			first[ext_index] = extended_offset;
 			last[ext_index] = get_start_sect(q) +
@@ -2657,8 +2657,7 @@ reread_partition_table(int leave) {
 #define MAX_PER_LINE	16
 static void
 print_buffer(unsigned char pbuffer[]) {
-	int	i,
-		l;
+	unsigned int i, l;
 
 	for (i = 0, l = 0; i < sector_size; i++, l++) {
 		if (l == 0)
@@ -2938,8 +2937,7 @@ tryprocpt(void) {
 	fclose(procpt);
 }
 
-static void
-dummy(int *kk) {}
+static void dummy(int *kk __attribute__ ((__unused__))) {}
 
 static void
 unknown_command(int c) {
diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index d379b70abc..aa27bad76c 100644
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -651,7 +651,8 @@ xbsd_dkcksum (struct xbsd_disklabel *lp) {
 }
 
 static int
-xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex) {
+xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d,
+		int pindex __attribute__((__unused__))) {
 	struct xbsd_partition *pp;
 	struct geom g;
 
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index cb00e7681c..cc95598765 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -323,9 +323,9 @@ sgi_get_bootfile(void) {
 
 void
 sgi_set_bootfile(const char* aFile) {
-	int i = 0;
 
 	if (sgi_check_bootfile(aFile)) {
+		size_t i = 0;
 		while (i < 16) {
 			if ((aFile[i] != '\n')	/* in principle caught again by next line */
 			    &&  (strlen(aFile) > i))
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index e43d1682aa..9335e75e24 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -331,7 +331,7 @@ static int verify_sun_cmp(int *a, int *b)
 void verify_sun(void)
 {
     uint32_t starts[SUN_NUM_PARTITIONS], lens[SUN_NUM_PARTITIONS], start, stop;
-    int i,j,k,starto,endo;
+    uint32_t i,j,k,starto,endo;
     int array[SUN_NUM_PARTITIONS];
 
     verify_sun_starts = starts;
@@ -403,7 +403,8 @@ void add_sun_partition(int n, int sys)
 	int whole_disk = 0;
 		
 	char mesg[256];
-	int i, first, last;
+	int i;
+	unsigned int first, last;
 
 	if (part->num_sectors && tag->tag != SSWAP16(SUN_TAG_UNASSIGNED)) {
 		printf(_("Partition %d is already defined.  Delete "
-- 
2.47.3