[前][次][番号順一覧][スレッド一覧]

ruby-changes:66984

From: aycabta <ko1@a...>
Date: Fri, 30 Jul 2021 02:26:58 +0900 (JST)
Subject: [ruby-changes:66984] 51ee24e7f7 (master): [ruby/reline] Add original C function declarations comment for each function

https://git.ruby-lang.org/ruby.git/commit/?id=51ee24e7f7

From 51ee24e7f7223b5c759eebcd9fe12d7f16ea6707 Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@g...>
Date: Sat, 24 Jul 2021 14:46:54 +0900
Subject: [ruby/reline] Add original C function declarations comment for each
 function

https://github.com/ruby/reline/commit/9a25ee9f12
---
 lib/reline/terminfo.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/reline/terminfo.rb b/lib/reline/terminfo.rb
index 7259268..53809c4 100644
--- a/lib/reline/terminfo.rb
+++ b/lib/reline/terminfo.rb
@@ -39,12 +39,13 @@ module Reline::Terminfo https://github.com/ruby/ruby/blob/trunk/lib/reline/terminfo.rb#L39
   @setupterm = Fiddle::Function.new(curses_dl['setupterm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
   #extern 'char *tigetstr(char *capname)'
   @tigetstr = Fiddle::Function.new(curses_dl['tigetstr'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_VOIDP)
-  #extern 'char *tiparm(const char *str, ...)'
-  @tiparm = begin
-    Fiddle::Function.new(curses_dl['tiparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
-  rescue
+  begin
+    #extern 'char *tiparm(const char *str, ...)'
+    @tiparm = Fiddle::Function.new(curses_dl['tiparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
+  rescue Fiddle::DLError
     # OpenBSD lacks tiparm
-    Fiddle::Function.new(curses_dl['tparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
+    #extern 'char *tparm(const char *str, ...)'
+    @tiparm = Fiddle::Function.new(curses_dl['tparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
   end
   # TODO: add int tigetflag(char *capname) and int tigetnum(char *capname)
 
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]