diff options
| author | Karel Zak | 2011-08-01 15:19:53 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-08-01 15:27:35 +0200 |
| commit | e99da659a963ea33abab3dd1206f95718434ecdf (patch) | |
| tree | e02b51f253702bd16755c1dc33e473342632b626 /fdisk/fdisk.c | |
| parent | tests: fix compiler warnings [-Wunused-parameter] (diff) | |
| download | kernel-qcow2-util-linux-e99da659a963ea33abab3dd1206f95718434ecdf.tar.gz kernel-qcow2-util-linux-e99da659a963ea33abab3dd1206f95718434ecdf.tar.xz kernel-qcow2-util-linux-e99da659a963ea33abab3dd1206f95718434ecdf.zip | |
fdisk: fix compiler warnings [-Wunused-parameter -Wsign-compare]
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk/fdisk.c')
| -rw-r--r-- | fdisk/fdisk.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index f6a2bc4d7..038536db2 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) { |