summaryrefslogtreecommitdiffstats
path: root/libfdisk
diff options
context:
space:
mode:
authorRuediger Meier2016-02-23 00:54:41 +0100
committerRuediger Meier2016-02-23 03:18:27 +0100
commitb9710f1f0850100e59503729f6e12eaa0ded7314 (patch)
treed56442407f5330dbcec32074983b32dd1fe730e5 /libfdisk
parentmisc: fix warnings "unused parameter" [-Wunused-parameter] (diff)
downloadkernel-qcow2-util-linux-b9710f1f0850100e59503729f6e12eaa0ded7314.tar.gz
kernel-qcow2-util-linux-b9710f1f0850100e59503729f6e12eaa0ded7314.tar.xz
kernel-qcow2-util-linux-b9710f1f0850100e59503729f6e12eaa0ded7314.zip
misc: fix compiler warnungs (unsigned/signed)
These ones should be fixed: libblkid/src/probe.c:393:39: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/probe.c:907:25: warning: signed and unsigned type in conditional expression [-Wsign-compare] libblkid/src/probe.c:1221:8: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/partitions/partitions.c:540:47: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/partitions/partitions.c:1043:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/partitions/partitions.c:1056:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/partitions/partitions.c:1057:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/partitions/partitions.c:1061:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/partitions/partitions.c:1199:27: warning: signed and unsigned type in conditional expression [-Wsign-compare] libblkid/src/partitions/partitions.c:1410:26: warning: signed and unsigned type in conditional expression [-Wsign-compare] libblkid/src/partitions/partitions.c:1431:25: warning: signed and unsigned type in conditional expression [-Wsign-compare] libblkid/src/superblocks/linux_raid.c:151:8: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] libblkid/src/superblocks/linux_raid.c:155:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] libblkid/src/superblocks/superblocks.c:375:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libblkid/src/superblocks/xfs.c:141:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libsmartcols/src/table.c:333:24: warning: signed and unsigned type in conditional expression [-Wsign-compare] libsmartcols/src/table.c:344:25: warning: signed and unsigned type in conditional expression [-Wsign-compare] libsmartcols/src/table_print.c:753:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/ask.c:364:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/utils.c:33:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/context.c:435:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/context.c:730:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/script.c:557:10: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/dos.c:1791:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libfdisk/src/gpt.c:813:42: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] misc-utils/logger.c:408:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] misc-utils/logger.c:408:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] misc-utils/logger.c:408:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] misc-utils/logger.c:408:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] misc-utils/logger.c:408:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] disk-utils/partx.c:140:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] disk-utils/partx.c:551:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] disk-utils/partx.c:640:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'libfdisk')
-rw-r--r--libfdisk/src/ask.c2
-rw-r--r--libfdisk/src/context.c4
-rw-r--r--libfdisk/src/dos.c2
-rw-r--r--libfdisk/src/gpt.c2
-rw-r--r--libfdisk/src/script.c2
-rw-r--r--libfdisk/src/utils.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
index 595bfe48a..7d55b5488 100644
--- a/libfdisk/src/ask.c
+++ b/libfdisk/src/ask.c
@@ -361,7 +361,7 @@ static char *mk_string_list(char *ptr, size_t *len, size_t *begin,
return ptr;
}
- if (*begin + *run == cur) { /* no gap, continue */
+ if (*begin + *run == (size_t)cur) { /* no gap, continue */
(*run)++;
return ptr;
}
diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index 89839069f..88b9f8afb 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -432,7 +432,7 @@ int fdisk_is_labeltype(struct fdisk_context *cxt, enum fdisk_labeltype id)
{
assert(cxt);
- return cxt->label && fdisk_label_get_type(cxt->label) == id;
+ return cxt->label && (unsigned)fdisk_label_get_type(cxt->label) == id;
}
/**
@@ -715,7 +715,7 @@ int fdisk_is_readonly(struct fdisk_context *cxt)
*/
void fdisk_unref_context(struct fdisk_context *cxt)
{
- int i;
+ unsigned i;
if (!cxt)
return;
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index d4d66f639..2f3a37bcb 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1788,7 +1788,7 @@ static int dos_locate_disklabel(struct fdisk_context *cxt, int n,
break;
default:
/* extended partitions */
- if (n - 1 + 4 < cxt->label->nparts_max) {
+ if ((size_t)n - 1 + 4 < cxt->label->nparts_max) {
struct pte *pe = self_pte(cxt, n - 1 + 4);
assert(pe->private_sectorbuffer);
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index c461bb511..f795b35a2 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -810,7 +810,7 @@ static ssize_t read_lba(struct fdisk_context *cxt, uint64_t lba,
if (lseek(cxt->dev_fd, offset, SEEK_SET) == (off_t) -1)
return -1;
- return read(cxt->dev_fd, buffer, bytes) != bytes;
+ return (size_t)read(cxt->dev_fd, buffer, bytes) != bytes;
}
diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c
index 6fba120df..3ca3f597f 100644
--- a/libfdisk/src/script.c
+++ b/libfdisk/src/script.c
@@ -554,7 +554,7 @@ static int write_file_json(struct fdisk_script *dp, FILE *f)
if (fdisk_partition_is_bootable(pa))
fprintf(f, ", \"bootable\": true");
- if (ct < fdisk_table_get_nents(dp->table))
+ if ((size_t)ct < fdisk_table_get_nents(dp->table))
fputs("},\n", f);
else
fputs("}\n", f);
diff --git a/libfdisk/src/utils.c b/libfdisk/src/utils.c
index 8b4d9ed58..5ba9e0466 100644
--- a/libfdisk/src/utils.c
+++ b/libfdisk/src/utils.c
@@ -30,7 +30,7 @@ static int read_from_device(struct fdisk_context *cxt,
}
r = read(cxt->dev_fd, buf, size);
- if (r < 0 || r != size) {
+ if (r < 0 || (size_t)r != size) {
if (!errno)
errno = EINVAL; /* probably too small file/device */
DBG(CXT, ul_debugobj(cxt, "failed to read %zu from offset %ju: %m",