mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a.
[ruby-core:32841] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
81e40399fb
commit
da55cfdf72
4 changed files with 21 additions and 8 deletions
12
vsnprintf.c
12
vsnprintf.c
|
@ -826,8 +826,10 @@ fp_begin: _double = va_arg(ap, double);
|
|||
ch = 'g';
|
||||
}
|
||||
if (ch == 'a' || ch == 'A') {
|
||||
flags |= HEXPREFIX;
|
||||
--expt;
|
||||
expsize = exponent(expstr, expt, ch + 'p' - 'a');
|
||||
ch += 'x' - 'a';
|
||||
size = expsize + ndig;
|
||||
size += 2; /* 0x */
|
||||
if (ndig > 1)
|
||||
|
@ -1037,7 +1039,8 @@ long_len:
|
|||
/* prefix */
|
||||
if (sign) {
|
||||
PRINT(&sign, 1);
|
||||
} else if (flags & HEXPREFIX) {
|
||||
}
|
||||
if (flags & HEXPREFIX) {
|
||||
ox[0] = '0';
|
||||
ox[1] = ch;
|
||||
PRINT(ox, 2);
|
||||
|
@ -1051,7 +1054,7 @@ long_len:
|
|||
PAD_L(dprec - fieldsz, zeroes);
|
||||
if (sign)
|
||||
fieldsz--;
|
||||
else if (flags & HEXPREFIX)
|
||||
if (flags & HEXPREFIX)
|
||||
fieldsz -= 2;
|
||||
|
||||
/* the string or number proper */
|
||||
|
@ -1059,10 +1062,7 @@ long_len:
|
|||
if ((flags & FPT) == 0) {
|
||||
PRINT(cp, fieldsz);
|
||||
} else { /* glue together f_p fragments */
|
||||
if (ch == 'a' || ch == 'A') {
|
||||
ox[0] = '0';
|
||||
ox[1] = ch + ('x' - 'a');
|
||||
PRINT(ox, 2);
|
||||
if (flags & HEXPREFIX) {
|
||||
if (ndig > 1 || flags & ALT) {
|
||||
ox[2] = *cp++;
|
||||
ox[3] = '.';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue