From 67bf09903f9391181841f3a6194282dd43c05ff2 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 Jan 2012 13:24:12 +0000 Subject: * ext/dl/callback/mkcallback.rb (gencallback): suppress unused variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dl/callback/mkcallback.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ext') diff --git a/ext/dl/callback/mkcallback.rb b/ext/dl/callback/mkcallback.rb index c644099395..e94a196247 100644 --- a/ext/dl/callback/mkcallback.rb +++ b/ext/dl/callback/mkcallback.rb @@ -121,20 +121,24 @@ def foreach_proc_entry end def gencallback(ty, calltype, proc_entry, argc, n) - <<-EOS + dltype = DLTYPE[ty] + ret = dltype[:conv] + src = <<-EOS #{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""} -static #{DLTYPE[ty][:type]} +static #{dltype[:type]} FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack#{i}"}.join(", ")}) { - VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""}; + VALUE #{ret ? "ret, " : ""}cb#{argc > 0 ? ", args[#{argc}]" : ""}; #{ (0...argc).collect{|i| "\n args[#{i}] = PTR2NUM(stack#{i});" }.join("") } cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc}); - ret = rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'}); - return #{DLTYPE[ty][:conv] ? DLTYPE[ty][:conv] % "ret" : ""}; + #{ret ? "ret = " : ""}rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'}); + EOS + src << " return #{ret % "ret"};\n" if ret + src << <<-EOS } #{calltype == STDCALL ? "#endif\n" : ""} EOS -- cgit v1.2.3