Skip to content

Commit 927cdd0

Browse files
GirgiasGirgias
committed
Inline "helper" macros
They just make refactoring harder
1 parent 1086b22 commit 927cdd0

11 files changed

+226
-164
lines changed

‎ext/dba/dba_db1.c

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
#include <sys/stat.h>
3232
#include <fcntl.h>
3333

34-
#define DB1_DATA dba_db1_data *dba = info->dbf
35-
#define DB1_GKEY DBT gkey; gkey.data = (char *) key; gkey.size = keylen
36-
3734
typedef struct {
3835
DB *dbp;
3936
} dba_db1_data;
@@ -84,16 +81,19 @@ DBA_OPEN_FUNC(db1)
8481

8582
DBA_CLOSE_FUNC(db1)
8683
{
87-
DB1_DATA;
84+
dba_db1_data *dba = info->dbf;
8885
dba->dbp->close(dba->dbp);
8986
pefree(info->dbf, info->flags&DBA_PERSISTENT);
9087
}
9188

9289
DBA_FETCH_FUNC(db1)
9390
{
91+
dba_db1_data *dba = info->dbf;
9492
DBT gval;
95-
DB1_DATA;
96-
DB1_GKEY;
93+
DBT gkey;
94+
95+
gkey.data = (char *) key;
96+
gkey.size = keylen;
9797

9898
memset(&gval, 0, sizeof(gval));
9999
if (dba->dbp->get(dba->dbp, &gkey, &gval, 0) == RET_SUCCESS) {
@@ -105,9 +105,12 @@ DBA_FETCH_FUNC(db1)
105105

106106
DBA_UPDATE_FUNC(db1)
107107
{
108+
dba_db1_data *dba = info->dbf;
108109
DBT gval;
109-
DB1_DATA;
110-
DB1_GKEY;
110+
DBT gkey;
111+
112+
gkey.data = (char *) key;
113+
gkey.size = keylen;
111114

112115
gval.data = (char *) val;
113116
gval.size = vallen;
@@ -117,26 +120,32 @@ DBA_UPDATE_FUNC(db1)
117120

118121
DBA_EXISTS_FUNC(db1)
119122
{
123+
dba_db1_data *dba = info->dbf;
120124
DBT gval;
121-
DB1_DATA;
122-
DB1_GKEY;
125+
DBT gkey;
126+
127+
gkey.data = (char *) key;
128+
gkey.size = keylen;
123129

124130
return dba->dbp->get(dba->dbp, &gkey, &gval, 0) != RET_SUCCESS ? FAILURE : SUCCESS;
125131
}
126132

127133
DBA_DELETE_FUNC(db1)
128134
{
129-
DB1_DATA;
130-
DB1_GKEY;
135+
dba_db1_data *dba = info->dbf;
136+
DBT gkey;
137+
138+
gkey.data = (char *) key;
139+
gkey.size = keylen;
131140

132141
return dba->dbp->del(dba->dbp, &gkey, 0) != RET_SUCCESS ? FAILURE : SUCCESS;
133142
}
134143

135144
DBA_FIRSTKEY_FUNC(db1)
136145
{
146+
dba_db1_data *dba = info->dbf;
137147
DBT gkey;
138148
DBT gval;
139-
DB1_DATA;
140149

141150
memset(&gkey, 0, sizeof(gkey));
142151
memset(&gval, 0, sizeof(gval));
@@ -150,9 +159,9 @@ DBA_FIRSTKEY_FUNC(db1)
150159

151160
DBA_NEXTKEY_FUNC(db1)
152161
{
162+
dba_db1_data *dba = info->dbf;
153163
DBT gkey;
154164
DBT gval;
155-
DB1_DATA;
156165

157166
memset(&gkey, 0, sizeof(gkey));
158167
memset(&gval, 0, sizeof(gval));

‎ext/dba/dba_db2.c

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
#include DB2_INCLUDE_FILE
3030
#endif
3131

32-
#define DB2_DATA dba_db2_data *dba = info->dbf
33-
#define DB2_GKEY \
34-
DBT gkey = {0}; \
35-
gkey.data = (char *) key; \
36-
gkey.size = keylen
37-
3832
typedef struct {
3933
DB *dbp;
4034
DBC *cursor;
@@ -83,7 +77,7 @@ DBA_OPEN_FUNC(db2)
8377

8478
DBA_CLOSE_FUNC(db2)
8579
{
86-
DB2_DATA;
80+
dba_db2_data *dba = info->dbf;
8781

8882
if (dba->cursor)
8983
dba->cursor->c_close(dba->cursor);
@@ -93,9 +87,12 @@ DBA_CLOSE_FUNC(db2)
9387

9488
DBA_FETCH_FUNC(db2)
9589
{
90+
dba_db2_data *dba = info->dbf;
9691
DBT gval = {0};
97-
DB2_DATA;
98-
DB2_GKEY;
92+
DBT gkey = {0};
93+
94+
gkey.data = (char *) key;
95+
gkey.size = keylen;
9996

10097
if (dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
10198
return NULL;
@@ -107,9 +104,12 @@ DBA_FETCH_FUNC(db2)
107104

108105
DBA_UPDATE_FUNC(db2)
109106
{
107+
dba_db2_data *dba = info->dbf;
110108
DBT gval = {0};
111-
DB2_DATA;
112-
DB2_GKEY;
109+
DBT gkey = {0};
110+
111+
gkey.data = (char *) key;
112+
gkey.size = keylen;
113113

114114
gval.data = (char *) val;
115115
gval.size = vallen;
@@ -123,9 +123,12 @@ DBA_UPDATE_FUNC(db2)
123123

124124
DBA_EXISTS_FUNC(db2)
125125
{
126+
dba_db2_data *dba = info->dbf;
126127
DBT gval = {0};
127-
DB2_DATA;
128-
DB2_GKEY;
128+
DBT gkey = {0};
129+
130+
gkey.data = (char *) key;
131+
gkey.size = keylen;
129132

130133
if (dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
131134
return FAILURE;
@@ -135,15 +138,18 @@ DBA_EXISTS_FUNC(db2)
135138

136139
DBA_DELETE_FUNC(db2)
137140
{
138-
DB2_DATA;
139-
DB2_GKEY;
141+
dba_db2_data *dba = info->dbf;
142+
DBT gkey = {0};
143+
144+
gkey.data = (char *) key;
145+
gkey.size = keylen;
140146

141147
return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
142148
}
143149

144150
DBA_FIRSTKEY_FUNC(db2)
145151
{
146-
DB2_DATA;
152+
dba_db2_data *dba = info->dbf;
147153

148154
if (dba->cursor) {
149155
dba->cursor->c_close(dba->cursor);
@@ -164,7 +170,7 @@ DBA_FIRSTKEY_FUNC(db2)
164170

165171
DBA_NEXTKEY_FUNC(db2)
166172
{
167-
DB2_DATA;
173+
dba_db2_data *dba = info->dbf;
168174
DBT gkey = {0}, gval = {0};
169175

170176
if (dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT)
@@ -182,7 +188,7 @@ DBA_OPTIMIZE_FUNC(db2)
182188

183189
DBA_SYNC_FUNC(db2)
184190
{
185-
DB2_DATA;
191+
dba_db2_data *dba = info->dbf;
186192

187193
return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
188194
}

‎ext/dba/dba_db3.c

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ static void php_dba_db3_errcall_fcn(
4141
php_error_docref(NULL, E_NOTICE, "%s%s", errpfx?errpfx:"", msg);
4242
}
4343

44-
#define DB3_DATA dba_db3_data *dba = info->dbf
45-
#define DB3_GKEY \
46-
DBT gkey; \
47-
memset(&gkey, 0, sizeof(gkey)); \
48-
gkey.data = (char *) key; gkey.size = keylen
49-
5044
typedef struct {
5145
DB *dbp;
5246
DBC *cursor;
@@ -116,7 +110,7 @@ DBA_OPEN_FUNC(db3)
116110

117111
DBA_CLOSE_FUNC(db3)
118112
{
119-
DB3_DATA;
113+
dba_db3_data *dba = info->dbf;
120114

121115
if (dba->cursor) dba->cursor->c_close(dba->cursor);
122116
dba->dbp->close(dba->dbp, 0);
@@ -125,10 +119,13 @@ DBA_CLOSE_FUNC(db3)
125119

126120
DBA_FETCH_FUNC(db3)
127121
{
122+
dba_db3_data *dba = info->dbf;
128123
DBT gval;
129124
char *new = NULL;
130-
DB3_DATA;
131-
DB3_GKEY;
125+
DBT gkey;
126+
127+
memset(&gkey, 0, sizeof(gkey));
128+
gkey.data = (char *) key; gkey.size = keylen;
132129

133130
memset(&gval, 0, sizeof(gval));
134131
if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
@@ -140,9 +137,12 @@ DBA_FETCH_FUNC(db3)
140137

141138
DBA_UPDATE_FUNC(db3)
142139
{
140+
dba_db3_data *dba = info->dbf;
143141
DBT gval;
144-
DB3_DATA;
145-
DB3_GKEY;
142+
DBT gkey;
143+
144+
memset(&gkey, 0, sizeof(gkey));
145+
gkey.data = (char *) key; gkey.size = keylen;
146146

147147
memset(&gval, 0, sizeof(gval));
148148
gval.data = (char *) val;
@@ -157,9 +157,12 @@ DBA_UPDATE_FUNC(db3)
157157

158158
DBA_EXISTS_FUNC(db3)
159159
{
160+
dba_db3_data *dba = info->dbf;
160161
DBT gval;
161-
DB3_DATA;
162-
DB3_GKEY;
162+
DBT gkey;
163+
164+
memset(&gkey, 0, sizeof(gkey));
165+
gkey.data = (char *) key; gkey.size = keylen;
163166

164167
memset(&gval, 0, sizeof(gval));
165168
if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
@@ -170,15 +173,18 @@ DBA_EXISTS_FUNC(db3)
170173

171174
DBA_DELETE_FUNC(db3)
172175
{
173-
DB3_DATA;
174-
DB3_GKEY;
176+
dba_db3_data *dba = info->dbf;
177+
DBT gkey;
178+
179+
memset(&gkey, 0, sizeof(gkey));
180+
gkey.data = (char *) key; gkey.size = keylen;
175181

176182
return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
177183
}
178184

179185
DBA_FIRSTKEY_FUNC(db3)
180186
{
181-
DB3_DATA;
187+
dba_db3_data *dba = info->dbf;
182188

183189
if (dba->cursor) {
184190
dba->cursor->c_close(dba->cursor);
@@ -195,7 +201,7 @@ DBA_FIRSTKEY_FUNC(db3)
195201

196202
DBA_NEXTKEY_FUNC(db3)
197203
{
198-
DB3_DATA;
204+
dba_db3_data *dba = info->dbf;
199205
DBT gkey, gval;
200206
char *nkey = NULL;
201207

@@ -219,7 +225,7 @@ DBA_OPTIMIZE_FUNC(db3)
219225

220226
DBA_SYNC_FUNC(db3)
221227
{
222-
DB3_DATA;
228+
dba_db3_data *dba = info->dbf;
223229

224230
return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
225231
}

0 commit comments

Comments
 (0)