summaryrefslogtreecommitdiffstats
path: root/sprintf.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-06 06:11:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-06 06:11:43 +0000
commita1d16dafc00c1bd0612d206910a8d7092d2fe4ca (patch)
tree0fc9701b470d9c1a4d68f011fc6204b5f43035cc /sprintf.c
parent45d85bd462410a0930c11eb1a7dab3acb2bb90f5 (diff)
downloadruby-a1d16dafc00c1bd0612d206910a8d7092d2fe4ca.tar.gz
ruby-a1d16dafc00c1bd0612d206910a8d7092d2fe4ca.tar.xz
ruby-a1d16dafc00c1bd0612d206910a8d7092d2fe4ca.zip
* sprintf.c (rb_str_format): ignore 0 flag for NaN and Inf.
[ruby-dev:33994] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sprintf.c')
-rw-r--r--sprintf.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/sprintf.c b/sprintf.c
index c54e8e8ad..f5b3e8474 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -766,7 +766,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (isnan(fval) || isinf(fval)) {
const char *expr;
- if (isnan(fval)) {
+ if (isnan(fval)) {
expr = "NaN";
}
else {
@@ -789,25 +789,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
blen++;
strncpy(&buf[blen], expr, strlen(expr));
}
- else if (flags & FZERO) {
- if (!isnan(fval) && fval < 0.0) {
- buf[blen++] = '-';
- need--;
- }
- else if (flags & FPLUS) {
- buf[blen++] = '+';
- need--;
- }
- else if (flags & FSPACE) {
- blen++;
- need--;
- }
- if ((need -= strlen(expr)) > 0) {
- memset(buf+blen, '0', need);
- blen += need;
- }
- strncpy(&buf[blen], expr, strlen(expr));
- }
else {
if (!isnan(fval) && fval < 0.0)
buf[blen + need - strlen(expr) - 1] = '-';