aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-08 13:29:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-08 13:29:25 +0000
commitb2ea6df3b58cb125a80564e791f2c2f23d150cdd (patch)
treebade7cfaeb1f8d172e53f8ec762ef21657e6d9cf
parentaf6708144630678ada8684bb77228ccc2056cb56 (diff)
downloadruby-b2ea6df3b58cb125a80564e791f2c2f23d150cdd.tar.gz
* ext/dl/lib/dl/struct.rb: clean a warning: assigned but unused
variable. patched by Kouhei Yanagita. [ruby-dev:42722] * ext/dl/lib/dl/import.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/dl/lib/dl/import.rb1
-rw-r--r--ext/dl/lib/dl/struct.rb1
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d2f2e60b0..e5f63a7d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 8 21:38:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/dl/lib/dl/struct.rb: clean a warning: assigned but unused
+ variable. patched by Kouhei Yanagita. [ruby-dev:42722]
+
+ * ext/dl/lib/dl/import.rb: ditto.
+
Wed Dec 8 21:36:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (shadowing_lvar_gen): fix line number. [ruby-dev:42718]
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index f9e8faf5f0..f22a53aa84 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -96,7 +96,6 @@ module DL
def parse_bind_options(opts)
h = {}
- prekey = nil
while( opt = opts.shift() )
case opt
when :stdcall, :cdecl
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index dc116f3be5..b8becca6b6 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -98,7 +98,6 @@ module DL
align = ALIGN_MAP[t]
end
offset = PackInfo.align(orig_offset, align)
- size = offset - orig_offset
@offset[i] = offset
if( t.is_a?(Array) )
offset += (SIZE_MAP[t[0]] * t[1])