From: Dr. David Alan Gilbert <dave@treblig.org>
Date: Sat, 17 Oct 2020 12:05:34 +0000 (+0100)
Subject: libmount: Fix 0x%u usage
X-Git-Tag: v2.37-rc1~409
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97c9ec9ce3db2fe0266218b287484bc9d848e1a4;p=thirdparty%2Futil-linux.git

libmount: Fix 0x%u usage

There's a couple of places which use varients on "0x%u" in format strings;
that's almost always wrong - you either want 0x%x or just %u.  In libmount's
case it's flags, so I'm assuming the intention really is hex.  In the ja.po
case it's %u in the original msgid.

Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
---

diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index 9af594f520..68b7bc383e 100644
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -731,7 +731,7 @@ int mnt_optstr_apply_flags(char **optstr, unsigned long flags,
 	if (!optstr || !map)
 		return -EINVAL;
 
-	DBG(CXT, ul_debug("applying 0x%08lu flags to '%s'", flags, *optstr));
+	DBG(CXT, ul_debug("applying 0x%08lx flags to '%s'", flags, *optstr));
 
 	maps[0] = map;
 	next = *optstr;
diff --git a/po/ja.po b/po/ja.po
index ec2c550ec6..4974c0bcc4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6820,7 +6820,7 @@ msgstr "間違った vtoc.sanity 値 [0x%08x] の sun ディスクラベルを
 #: libfdisk/src/sun.c:163
 #, c-format
 msgid "Detected sun disklabel with wrong vtoc.nparts [%u]."
-msgstr "間違った vtoc.nparts 値 [0x%u] の sun ディスクラベルを検出しました。"
+msgstr "間違った vtoc.nparts 値 [%u] の sun ディスクラベルを検出しました。"
 
 #: libfdisk/src/sun.c:168
 msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)"