summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-09 12:21:26 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-09 12:21:26 +0000
commit85f10041b2400a8c87cf718df642e0003ec797ac (patch)
tree7f34d7a1c201d81a10c87c94fce369852e9fe2e8
parent6f1c1b496e7a5866f9b50b27650473ef1be5d85b (diff)
* strftime.c (rb_strftime_with_timespec): clear colons at unknown
directive. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--strftime.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 52daaa9ff6..3bc9be8586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 9 21:20:22 2010 Tanaka Akira <akr@fsij.org>
+
+ * strftime.c (rb_strftime_with_timespec): clear colons at unknown
+ directive.
+
Fri Jul 9 21:04:10 2010 Tanaka Akira <akr@fsij.org>
* strftime.c: don't call tzset. strftime.c doesn't depend on
diff --git a/strftime.c b/strftime.c
index b404b7812c..4f1481de7d 100644
--- a/strftime.c
+++ b/strftime.c
@@ -771,6 +771,7 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const str
precision = -1;
flags = 0;
padding = 0;
+ colons = 0;
break;
}
if (i) {