diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2015-06-24 01:48:18 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2015-06-24 02:02:05 +0200 |
| commit | ec62e858734a66130f68d036c55c2050bde1e52e (patch) | |
| tree | 347780d708855d7f80c9aa51a88f3da9b0fd56ed /src/udev/ata_id | |
| parent | 0891c5ed0b8d9ae20cae585d87da483d5d9c1e67 (diff) | |
| download | systemd-ec62e858734a66130f68d036c55c2050bde1e52e.tar.gz | |
ata_id: unbotch format specifier
Commit v218-247-g11c6f69 broke the output of the utility. "%1$" PRIu64
"x" expands to "%1$lux", essentially "%lux", which shows the problem.
u and x cannot be combined, u wins as the type character, and x gets
emitted verbatim to stdout.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1227503
Diffstat (limited to 'src/udev/ata_id')
| -rw-r--r-- | src/udev/ata_id/ata_id.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index cc1bf45ae9..7ba0b7fc8f 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -639,8 +639,8 @@ int main(int argc, char *argv[]) */ word = identify.wyde[108]; if ((word & 0xf000) == 0x5000) - printf("ID_WWN=0x%1$"PRIu64"x\n" - "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n", + printf("ID_WWN=0x%1$" PRIx64 "\n" + "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n", identify.octa[108/4]); /* from Linux's include/linux/ata.h */ |