summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuediger Meier2016-03-09 17:56:58 +0100
committerRuediger Meier2016-03-12 11:28:03 +0100
commite1a15f8f686df21281ee8e20349f4d8579a8a9e0 (patch)
treec95fda9c4a7f9f3d91a2433f6288804d1d7fbb2f
parentbuild-sys: release++ (v2.28-rc1) (diff)
downloadkernel-qcow2-util-linux-e1a15f8f686df21281ee8e20349f4d8579a8a9e0.tar.gz
kernel-qcow2-util-linux-e1a15f8f686df21281ee8e20349f4d8579a8a9e0.tar.xz
kernel-qcow2-util-linux-e1a15f8f686df21281ee8e20349f4d8579a8a9e0.zip
misc: fix printf i386 compiler warnings
Still a few printf warnings found on i386 Linux: libfdisk/src/alignment.c: In function 'fdisk_align_lba': libfdisk/src/alignment.c:115:3: warning: format '%ju' expects argument of type 'uintmax_t', but argument 6 has type 'long unsigned int' [-Wformat] sys-utils/lsns.c: In function ‘add_namespace’: sys-utils/lsns.c:346:2: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘ino_t’ [-Wformat] sys-utils/lsns.c: In function ‘add_process_to_namespace’: sys-utils/lsns.c:362:2: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘ino_t’ [-Wformat] sys-utils/lsns.c: In function ‘add_scols_line’: sys-utils/lsns.c:440:4: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘ino_t’ [-Wformat] Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
-rw-r--r--libfdisk/src/alignment.c2
-rw-r--r--sys-utils/lsns.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
index 24f1db957..aa082e189 100644
--- a/libfdisk/src/alignment.c
+++ b/libfdisk/src/alignment.c
@@ -112,7 +112,7 @@ fdisk_sector_t fdisk_align_lba(struct fdisk_context *cxt, fdisk_sector_t lba, in
}
if (lba != res)
- DBG(CXT, ul_debugobj(cxt, "LBA %ju -aligned-%s-> %ju [grain=%jus]",
+ DBG(CXT, ul_debugobj(cxt, "LBA %ju -aligned-%s-> %ju [grain=%lus]",
(uintmax_t) lba,
direction == FDISK_ALIGN_UP ? "up" :
direction == FDISK_ALIGN_DOWN ? "down" : "near",
diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index 83b07f5a8..962142527 100644
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -343,7 +343,7 @@ static struct lsns_namespace *add_namespace(struct lsns *ls, int type, ino_t ino
if (!ns)
return NULL;
- DBG(NS, ul_debugobj(ns, "new %s[%lu]", ns_names[type], ino));
+ DBG(NS, ul_debugobj(ns, "new %s[%ju]", ns_names[type], (uintmax_t)ino));
INIT_LIST_HEAD(&ns->processes);
INIT_LIST_HEAD(&ns->namespaces);
@@ -359,7 +359,8 @@ static int add_process_to_namespace(struct lsns *ls, struct lsns_namespace *ns,
{
struct list_head *p;
- DBG(NS, ul_debugobj(ns, "add process [%p] pid=%d to %s[%lu]", proc, proc->pid, ns_names[ns->type], ns->id));
+ DBG(NS, ul_debugobj(ns, "add process [%p] pid=%d to %s[%ju]",
+ proc, proc->pid, ns_names[ns->type], (uintmax_t)ns->id));
list_for_each(p, &ls->processes) {
struct lsns_process *xproc = list_entry(p, struct lsns_process, processes);
@@ -437,7 +438,7 @@ static void add_scols_line(struct lsns *ls, struct libscols_table *table,
switch (get_column_id(i)) {
case COL_NS:
- xasprintf(&str, "%lu", ns->id);
+ xasprintf(&str, "%ju", (uintmax_t)ns->id);
break;
case COL_PID:
xasprintf(&str, "%d", (int) proc->pid);