|
 |
17b0f1 |
From b2aa96a5e92762adaff127227338fe5034175fcd Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
17b0f1 |
Date: Wed, 24 Jun 2015 01:48:18 +0200
|
|
|
17b0f1 |
Subject: [PATCH] ata_id: unbotch format specifier
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Commit v218-247-g11c6f69 broke the output of the utility. "%1$" PRIu64
|
|
|
17b0f1 |
"x" expands to "%1$lux", essentially "%lux", which shows the problem.
|
|
|
17b0f1 |
u and x cannot be combined, u wins as the type character, and x gets
|
|
|
17b0f1 |
emitted verbatim to stdout.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
References: https://bugzilla.redhat.com/show_bug.cgi?id=1227503
|
|
|
17b0f1 |
(cherry picked from commit ec62e858734a66130f68d036c55c2050bde1e52e)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Cherry-picked from: ec62e85
|
|
|
17b0f1 |
Resolves: #1222517
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/udev/ata_id/ata_id.c | 4 ++--
|
|
|
17b0f1 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
|
|
|
17b0f1 |
index 9e4f674a9e..b6f28c6f53 100644
|
|
|
17b0f1 |
--- a/src/udev/ata_id/ata_id.c
|
|
|
17b0f1 |
+++ b/src/udev/ata_id/ata_id.c
|
|
|
17b0f1 |
@@ -639,8 +639,8 @@ int main(int argc, char *argv[])
|
|
|
17b0f1 |
*/
|
|
|
17b0f1 |
word = identify.wyde[108];
|
|
|
17b0f1 |
if ((word & 0xf000) == 0x5000)
|
|
|
17b0f1 |
- printf("ID_WWN=0x%1$"PRIu64"x\n"
|
|
|
17b0f1 |
- "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n",
|
|
|
17b0f1 |
+ printf("ID_WWN=0x%1$" PRIx64 "\n"
|
|
|
17b0f1 |
+ "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n",
|
|
|
17b0f1 |
identify.octa[108/4]);
|
|
|
17b0f1 |
|
|
|
17b0f1 |
/* from Linux's include/linux/ata.h */
|