From 8b52f98339fad26f4316ee5d1c432f212693f2c5 Mon Sep 17 00:00:00 2001
From: Stewart Brodie <sbrodie@gitlab.riscosopen.org>
Date: Thu, 14 Sep 2000 14:42:06 +0000
Subject: [PATCH] Fixed minor printf bug.
Detail:
%#x shows a leading 0x (and %#X leads with 0X) only when the value
to be displayed is NOT zero.
Admin:
Cross-verified against: C89 standard; C9X standard; gcc 2.95 implementation.
Built.
Version 5.14. Tagged as 'RISC_OSLib-5_14'
---
VersionASM | 12 ++++++------
VersionNum | 18 +++++++++---------
c/printf | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/VersionASM b/VersionASM
index 4de8b45..7c31a52 100644
--- a/VersionASM
+++ b/VersionASM
@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
-Module_MajorVersion SETS "5.13"
-Module_Version SETA 513
+Module_MajorVersion SETS "5.14"
+Module_Version SETA 514
Module_MinorVersion SETS ""
-Module_Date SETS "17 Aug 2000"
-Module_ApplicationDate2 SETS "17-Aug-00"
-Module_ApplicationDate4 SETS "17-Aug-2000"
-Module_FullVersion SETS "5.13"
+Module_Date SETS "14 Sep 2000"
+Module_ApplicationDate2 SETS "14-Sep-00"
+Module_ApplicationDate4 SETS "14-Sep-2000"
+Module_FullVersion SETS "5.14"
END
diff --git a/VersionNum b/VersionNum
index f0449bb..2b958c6 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,18 +1,18 @@
-/* (5.13)
+/* (5.14)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.13
+#define Module_MajorVersion_CMHG 5.14
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 17 Aug 2000
+#define Module_Date_CMHG 14 Sep 2000
-#define Module_MajorVersion "5.13"
-#define Module_Version 513
+#define Module_MajorVersion "5.14"
+#define Module_Version 514
#define Module_MinorVersion ""
-#define Module_Date "17 Aug 2000"
+#define Module_Date "14 Sep 2000"
-#define Module_ApplicationDate2 "17-Aug-00"
-#define Module_ApplicationDate4 "17-Aug-2000"
+#define Module_ApplicationDate2 "14-Sep-00"
+#define Module_ApplicationDate4 "14-Sep-2000"
-#define Module_FullVersion "5.13"
+#define Module_FullVersion "5.14"
diff --git a/c/printf b/c/printf
index 615c82c..048393d 100644
--- a/c/printf
+++ b/c/printf
@@ -365,14 +365,14 @@ int __vfprintf(FILE *p, const char *fmt, va_list args,
case 'X': v = va_arg(args, int);
if (flags & _SHORTSPEC) v = (unsigned short)v;
hextab = "0123456789ABCDEF";
- prefix = (flags&_VARIANT) ? "0X" : "";
+ prefix = ((flags&_VARIANT) != 0 && v != 0)? "0X" : "";
if (flags & _PRECGIVEN) flags &= ~_PADZERO;
break;
case 'x': v = va_arg(args, int);
if (flags & _SHORTSPEC) v = (unsigned short)v;
hextab = "0123456789abcdef";
- prefix = (flags&_VARIANT) ? "0x" : "";
+ prefix = ((flags&_VARIANT) != 0 && v != 0)? "0X" : "";
if (flags & _PRECGIVEN) flags &= ~_PADZERO;
break;
--
GitLab