daandemeyer / rpms / systemd

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