/[pkg-ruby-extras]/trunk/tokyocabinet-ruby/debian/patches/fix_checking_block_parameter.patch
ViewVC logotype

Contents of /trunk/tokyocabinet-ruby/debian/patches/fix_checking_block_parameter.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 5780 - (show annotations) (download)
Wed Aug 18 20:38:42 2010 UTC (2 years, 10 months ago) by spk-guest
File size: 6029 byte(s) 
[svn-inject] Application des modifications Debian (1.30-2) pour le trunk
1 Description: Fix checking block parameter for Ruby 1.9.2
2 * tokyocabinet.c: replace «rb_block_given_p() != Qtrue» by
3 «!rb_block_given_p()» works with Ruby 1.8 and 1.9.2
4 see http://gist.github.com/191146
5 Author: Laurent Arnoud <laurent@spkdev.net>
6 --- a/tokyocabinet.c
7 +++ b/tokyocabinet.c
8 @@ -951,7 +951,7 @@ static VALUE hdb_each(VALUE vself){
9 VALUE vhdb, vrv;
10 TCHDB *hdb;
11 TCXSTR *kxstr, *vxstr;
12 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
13 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
14 vhdb = rb_iv_get(vself, HDBVNDATA);
15 Data_Get_Struct(vhdb, TCHDB, hdb);
16 vrv = Qnil;
17 @@ -972,7 +972,7 @@ static VALUE hdb_each_key(VALUE vself){
18 VALUE vhdb, vrv;
19 TCHDB *hdb;
20 TCXSTR *kxstr, *vxstr;
21 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
22 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
23 vhdb = rb_iv_get(vself, HDBVNDATA);
24 Data_Get_Struct(vhdb, TCHDB, hdb);
25 vrv = Qnil;
26 @@ -992,7 +992,7 @@ static VALUE hdb_each_value(VALUE vself)
27 VALUE vhdb, vrv;
28 TCHDB *hdb;
29 TCXSTR *kxstr, *vxstr;
30 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
31 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
32 vhdb = rb_iv_get(vself, HDBVNDATA);
33 Data_Get_Struct(vhdb, TCHDB, hdb);
34 vrv = Qnil;
35 @@ -1697,7 +1697,7 @@ static VALUE bdb_each(VALUE vself){
36 TCBDB *bdb;
37 BDBCUR *cur;
38 TCXSTR *kxstr, *vxstr;
39 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
40 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
41 vbdb = rb_iv_get(vself, BDBVNDATA);
42 Data_Get_Struct(vbdb, TCBDB, bdb);
43 vrv = Qnil;
44 @@ -1723,7 +1723,7 @@ static VALUE bdb_each_key(VALUE vself){
45 BDBCUR *cur;
46 const char *kbuf;
47 int ksiz;
48 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
49 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
50 vbdb = rb_iv_get(vself, BDBVNDATA);
51 Data_Get_Struct(vbdb, TCBDB, bdb);
52 vrv = Qnil;
53 @@ -1744,7 +1744,7 @@ static VALUE bdb_each_value(VALUE vself)
54 BDBCUR *cur;
55 const char *vbuf;
56 int vsiz;
57 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
58 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
59 vbdb = rb_iv_get(vself, BDBVNDATA);
60 Data_Get_Struct(vbdb, TCBDB, bdb);
61 vrv = Qnil;
62 @@ -2413,7 +2413,7 @@ static VALUE fdb_each(VALUE vself){
63 char *vbuf, kbuf[NUMBUFSIZ];
64 int vsiz, ksiz;
65 uint64_t id;
66 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
67 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
68 vfdb = rb_iv_get(vself, FDBVNDATA);
69 Data_Get_Struct(vfdb, TCFDB, fdb);
70 vrv = Qnil;
71 @@ -2436,7 +2436,7 @@ static VALUE fdb_each_key(VALUE vself){
72 char kbuf[NUMBUFSIZ];
73 int ksiz;
74 uint64_t id;
75 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
76 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
77 vfdb = rb_iv_get(vself, FDBVNDATA);
78 Data_Get_Struct(vfdb, TCFDB, fdb);
79 vrv = Qnil;
80 @@ -2455,7 +2455,7 @@ static VALUE fdb_each_value(VALUE vself)
81 char *vbuf;
82 int vsiz;
83 uint64_t id;
84 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
85 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
86 vfdb = rb_iv_get(vself, FDBVNDATA);
87 Data_Get_Struct(vfdb, TCFDB, fdb);
88 vrv = Qnil;
89 @@ -3024,7 +3024,7 @@ static VALUE tdb_each(VALUE vself){
90 TCMAP *cols;
91 char *kbuf;
92 int ksiz;
93 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
94 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
95 vtdb = rb_iv_get(vself, TDBVNDATA);
96 Data_Get_Struct(vtdb, TCTDB, tdb);
97 vrv = Qnil;
98 @@ -3045,7 +3045,7 @@ static VALUE tdb_each_key(VALUE vself){
99 TCTDB *tdb;
100 char *kbuf;
101 int ksiz;
102 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
103 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
104 vtdb = rb_iv_get(vself, TDBVNDATA);
105 Data_Get_Struct(vtdb, TCTDB, tdb);
106 vrv = Qnil;
107 @@ -3064,7 +3064,7 @@ static VALUE tdb_each_value(VALUE vself)
108 TCMAP *cols;
109 char *kbuf;
110 int ksiz;
111 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
112 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
113 vtdb = rb_iv_get(vself, TDBVNDATA);
114 Data_Get_Struct(vtdb, TCTDB, tdb);
115 vrv = Qnil;
116 @@ -3274,7 +3274,7 @@ static VALUE tdbqry_searchout(VALUE vsel
117 static VALUE tdbqry_proc(VALUE vself, VALUE vproc){
118 VALUE vqry;
119 TDBQRY *qry;
120 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
121 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
122 vqry = rb_iv_get(vself, TDBQRYVNDATA);
123 Data_Get_Struct(vqry, TDBQRY, qry);
124 return tctdbqryproc(qry, (TDBQRYPROC)tdbqry_procrec, NULL) ? Qtrue : Qfalse;
125 @@ -3793,7 +3793,7 @@ static VALUE adb_each(VALUE vself){
126 TCADB *adb;
127 char *tkbuf, *tvbuf;
128 int tksiz, tvsiz;
129 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
130 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
131 vadb = rb_iv_get(vself, ADBVNDATA);
132 Data_Get_Struct(vadb, TCADB, adb);
133 vrv = Qnil;
134 @@ -3815,7 +3815,7 @@ static VALUE adb_each_key(VALUE vself){
135 TCADB *adb;
136 char *tkbuf;
137 int tksiz;
138 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
139 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
140 vadb = rb_iv_get(vself, ADBVNDATA);
141 Data_Get_Struct(vadb, TCADB, adb);
142 vrv = Qnil;
143 @@ -3833,7 +3833,7 @@ static VALUE adb_each_value(VALUE vself)
144 TCADB *adb;
145 char *tkbuf, *tvbuf;
146 int tksiz, tvsiz;
147 - if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
148 + if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
149 vadb = rb_iv_get(vself, ADBVNDATA);
150 Data_Get_Struct(vadb, TCADB, adb);
151 vrv = Qnil;
  ViewVC Help
Powered by ViewVC 1.1.5