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