1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/fiddle] Prefer String#unpack1 in Fiddle::ValueUtil

Browse Source 
(https://github.com/ruby/fiddle/pull/118)

String#unpack1 is available since Ruby 2.4, and support for older than
Ruby 2.5 was dropped by #85.
Also simplified a common return statement.
This commit is contained in:
Mau Magnaguagno 2022-12-19 22:27:03 -03:00 committed by Hiroshi SHIBATA
parent 1dc8c18b72
commit 8df574a492
Notes: git 2022-12-26 06:09:43 +00:00 
Merged: https://github.com/ruby/ruby/pull/7025
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ext/fiddle/lib/fiddle/value.rb
View File

@ -6,17 +6,17 @@ module Fiddle
def unsigned_value(val, ty)
case ty.abs
when TYPE_CHAR
[val].pack("c").unpack("C")[0]
[val].pack("c").unpack1("C")
when TYPE_SHORT
[val].pack("s!").unpack("S!")[0]
[val].pack("s!").unpack1("S!")
when TYPE_INT
[val].pack("i!").unpack("I!")[0]
[val].pack("i!").unpack1("I!")
when TYPE_LONG
[val].pack("l!").unpack("L!")[0]
[val].pack("l!").unpack1("L!")
else
if defined?(TYPE_LONG_LONG) and
ty.abs == TYPE_LONG_LONG
[val].pack("q").unpack("Q")[0]
[val].pack("q").unpack1("Q")
else
val
end
@ -26,17 +26,17 @@ module Fiddle
def signed_value(val, ty)
case ty.abs
when TYPE_CHAR
[val].pack("C").unpack("c")[0]
[val].pack("C").unpack1("c")
when TYPE_SHORT
[val].pack("S!").unpack("s!")[0]
[val].pack("S!").unpack1("s!")
when TYPE_INT
[val].pack("I!").unpack("i!")[0]
[val].pack("I!").unpack1("i!")
when TYPE_LONG
[val].pack("L!").unpack("l!")[0]
[val].pack("L!").unpack1("l!")
else
if defined?(TYPE_LONG_LONG) and
ty.abs == TYPE_LONG_LONG
[val].pack("Q").unpack("q")[0]
[val].pack("Q").unpack1("q")
else
val
end
@ -80,11 +80,11 @@ module Fiddle
else
case SIZEOF_VOIDP
when SIZEOF_LONG
return [arg].pack("p").unpack("l!")[0]
return [arg].pack("p").unpack1("l!")
else
if defined?(SIZEOF_LONG_LONG) and
SIZEOF_VOIDP == SIZEOF_LONG_LONG
return [arg].pack("p").unpack("q")[0]
return [arg].pack("p").unpack1("q")
else
raise(RuntimeError, "sizeof(void*)?")
end
@ -102,10 +102,8 @@ module Fiddle
return val.unpack('C*')
end
end
return arg
else
return arg
end
return arg
else
if( arg.respond_to?(:to_ptr) )
return arg.to_ptr.to_i