kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* time.c (time_strftime): copy encoding from format. [ruby-dev:33303]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-23 06:25:06 +00:00
parent e94ece76d8
commit 9430d7d803
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Jan 23 15:25:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (time_strftime): copy encoding from format. [ruby-dev:33303]
Wed Jan 23 15:04:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jan 23 15:04:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_make_independent): should set length. * string.c (str_make_independent): should set length.

2
time.c
View file

@ -2065,6 +2065,7 @@ rb_strftime(char **buf, const char *format, struct tm *time)
static VALUE static VALUE
time_strftime(VALUE time, VALUE format) time_strftime(VALUE time, VALUE format)
{ {
void rb_enc_copy(VALUE, VALUE);
struct time_object *tobj; struct time_object *tobj;
char buffer[SMALLBUF], *buf = buffer; char buffer[SMALLBUF], *buf = buffer;
const char *fmt; const char *fmt;
@ -2105,6 +2106,7 @@ time_strftime(VALUE time, VALUE format)
} }
str = rb_str_new(buf, len); str = rb_str_new(buf, len);
if (buf != buffer) free(buf); if (buf != buffer) free(buf);
rb_enc_copy(str, format);
return str; return str;
} }