summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 03:21:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 03:21:43 +0000
commit43153eeab2c9b047bf90403cf28c418a91b63a5a (patch)
tree7d30b9fc6edec21613ccb3e8d5c5c1aaa3002cb7
parent85d0e8259059bf44f45a809531cd14f1bf0355dc (diff)
downloadruby-43153eeab2c9b047bf90403cf28c418a91b63a5a.tar.gz
ruby-43153eeab2c9b047bf90403cf28c418a91b63a5a.tar.xz
ruby-43153eeab2c9b047bf90403cf28c418a91b63a5a.zip
* ext/iconv/iconv.c (iconv_iconv): no needs to initialize with Qnil
before rb_scan_args call. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/iconv/iconv.c1
-rw-r--r--version.h6
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 1f0ab84f0..6141a5bb4 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -828,7 +828,6 @@ iconv_iconv(int argc, VALUE *argv, VALUE self)
VALUE cd = check_iconv(self);
long start = 0, length = 0, slen = 0;
- n1 = n2 = Qnil;
rb_scan_args(argc, argv, "12", &str, &n1, &n2);
if (!NIL_P(str)) {
VALUE n = rb_str_length(StringValue(str));
diff --git a/version.h b/version.h
index f8de956df..a591007fb 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-06-05"
+#define RUBY_RELEASE_DATE "2008-06-06"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080605
+#define RUBY_RELEASE_CODE 20080606
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];