diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-29 16:05:10 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-29 16:05:10 +0000 |
| commit | 5cdf16b6cf738ff134444fc936a03ba243b02b99 (patch) | |
| tree | 5b104f83a35c88bc842a7250750d6260ca5bdfcb | |
| parent | 4a3a3d643584775f703972990c8aa77dd6465291 (diff) | |
| download | ruby-5cdf16b6cf738ff134444fc936a03ba243b02b99.tar.gz ruby-5cdf16b6cf738ff134444fc936a03ba243b02b99.tar.xz ruby-5cdf16b6cf738ff134444fc936a03ba243b02b99.zip | |
* string.c (rb_str_justify): [ruby-dev:25367]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | string.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Dec 30 00:41:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_str_justify): [ruby-dev:25367] + Wed Dec 29 11:07:07 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/generators/template/html/kilmer.rb: Update to use new @@ -47,6 +51,10 @@ Mon Dec 27 16:55:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use rb_hash_new to get exactly a Hash. fix [ruby-dev:25325]. +Mon Dec 27 16:29:56 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_str_justify): [ruby-dev:25341] + Mon Dec 27 15:47:48 2004 Minero Aoki <aamine@loveruby.net> * test/fileutils/fileasserts.rb: sync with HEAD. @@ -4474,7 +4474,6 @@ rb_str_justify(argc, argv, str, jflag) rb_scan_args(argc, argv, "11", &w, &pad); width = NUM2LONG(w); - if (width < 0 || RSTRING(str)->len >= width) return rb_str_dup(str); if (argc == 2) { StringValue(pad); f = RSTRING(pad)->ptr; @@ -4483,6 +4482,7 @@ rb_str_justify(argc, argv, str, jflag) rb_raise(rb_eArgError, "zero width padding"); } } + if (width < 0 || RSTRING(str)->len >= width) return rb_str_dup(str); res = rb_str_new5(str, 0, width); p = RSTRING(res)->ptr; if (jflag != 'l') { |