valeriyvdovin / rpms / systemd

Forked from rpms/systemd 4 years ago
Clone

Blame SOURCES/0223-ata_id-unbotch-format-specifier.patch

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