Skip to content

Commit 88af7e9

Browse files
helly25helly25
committed
Use the the name 'flatfile' correctly so the handler support can be built now.
#I do not like the lock solution since a crashed php would leave the *lck #file locked now.
1 parent 4be5092 commit 88af7e9

File tree

5 files changed

+36
-39
lines changed

5 files changed

+36
-39
lines changed

‎ext/dba/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ AC_ARG_WITH(flatfile,
246246
if test "$withval" = "yes"; then
247247
PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
248248
AC_DEFINE(DBA_FLATFILE, 1, [ ])
249-
flat_sources="php_flatfile.c libflatfile/flatfile.c"
249+
flat_sources="dba_flatfile.c libflatfile/flatfile.c"
250250
THIS_RESULT="builtin"
251251
fi
252252
])

‎ext/dba/dba.c

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "php_cdb.h"
3636
#include "php_db2.h"
3737
#include "php_db3.h"
38+
#include "php_flatfile.h"
3839

3940
/* {{{ dba_functions[]
4041
*/

‎ext/dba/dba_flatile.c renamed to ‎ext/dba/dba_flatfile.c

+20-24
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@
4444
#endif
4545
#endif
4646

47-
typedef struct {
48-
datum nextkey;
49-
} dba_dbm_data;
50-
51-
#define DBM_DATA dba_dbm_data *dba = info->dbf
47+
#define DBM_DATA flatfile *dba = info->dbf
5248
#define DBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = keylen
5349

5450
#define TRUNC_IT(extension, mode) \
@@ -59,7 +55,7 @@ typedef struct {
5955
close(fd);
6056

6157

62-
DBA_OPEN_FUNC(dbm)
58+
DBA_OPEN_FUNC(flatfile)
6359
{
6460
char *fmode;
6561
php_stream *fp;
@@ -72,7 +68,7 @@ DBA_OPEN_FUNC(dbm)
7268
int retries = 0;
7369
#endif
7470

75-
info->dbf = ecalloc(sizeof(dba_dbm_data), 1);
71+
info->dbf = ecalloc(sizeof(flatfile), 1);
7672
if (!info->dbf) {
7773
*error = "Out of memory";
7874
return FAILURE;
@@ -150,14 +146,14 @@ DBA_OPEN_FUNC(dbm)
150146
return FAILURE;
151147
}
152148

153-
((dba_dbm_data*)info->dbf)->fp = fp;
154-
((dba_dbm_data*)info->dbf)->lockfn = lockfn;
155-
((dba_dbm_data*)info->dbf)->lockfd = lockfd;
149+
((flatfile*)info->dbf)->fp = fp;
150+
((flatfile*)info->dbf)->lockfn = lockfn;
151+
((flatfile*)info->dbf)->lockfd = lockfd;
156152

157153
return SUCCESS;
158154
}
159155

160-
DBA_CLOSE_FUNC(dbm)
156+
DBA_CLOSE_FUNC(flatfile)
161157
{
162158
DBM_DATA;
163159

@@ -178,13 +174,13 @@ DBA_CLOSE_FUNC(dbm)
178174
efree(dba);
179175
}
180176

181-
#define DBM_FETCH(gkey) dbm_file_fetch((dba_dbm_data*)info->dbf, gkey TSRMLS_CC)
182-
#define DBM_STORE(gkey, gval) dbm_file_store((dba_dbm_data*)info->dbf, gkey, gval, DBM_REPLACE TSRMLS_CC)
183-
#define DBM_DELETE(gkey) dbm_file_delete((dba_dbm_data*)info->dbf, gkey TSRMLS_CC)
184-
#define DBM_FIRSTKEY() dbm_file_firstkey((dba_dbm_data*)info->dbf TSRMLS_CC)
185-
#define DBM_NEXTKEY(gkey) dbm_file_nextkey((dba_dbm_data*)info->dbf TSRMLS_CC)
177+
#define DBM_FETCH(gkey) dbm_file_fetch((flatfile*)info->dbf, gkey TSRMLS_CC)
178+
#define DBM_STORE(gkey, gval) dbm_file_store((flatfile*)info->dbf, gkey, gval, DBM_REPLACE TSRMLS_CC)
179+
#define DBM_DELETE(gkey) dbm_file_delete((flatfile*)info->dbf, gkey TSRMLS_CC)
180+
#define DBM_FIRSTKEY() dbm_file_firstkey((flatfile*)info->dbf TSRMLS_CC)
181+
#define DBM_NEXTKEY(gkey) dbm_file_nextkey((flatfile*)info->dbf TSRMLS_CC)
186182

187-
DBA_FETCH_FUNC(dbm)
183+
DBA_FETCH_FUNC(flatfile)
188184
{
189185
datum gval;
190186
char *new = NULL;
@@ -199,7 +195,7 @@ DBA_FETCH_FUNC(dbm)
199195
return new;
200196
}
201197

202-
DBA_UPDATE_FUNC(dbm)
198+
DBA_UPDATE_FUNC(flatfile)
203199
{
204200
datum gval;
205201

@@ -210,7 +206,7 @@ DBA_UPDATE_FUNC(dbm)
210206
return (DBM_STORE(gkey, gval) == -1 ? FAILURE : SUCCESS);
211207
}
212208

213-
DBA_EXISTS_FUNC(dbm)
209+
DBA_EXISTS_FUNC(flatfile)
214210
{
215211
datum gval;
216212
DBM_GKEY;
@@ -223,13 +219,13 @@ DBA_EXISTS_FUNC(dbm)
223219
return FAILURE;
224220
}
225221

226-
DBA_DELETE_FUNC(dbm)
222+
DBA_DELETE_FUNC(flatfile)
227223
{
228224
DBM_GKEY;
229225
return(DBM_DELETE(gkey) == -1 ? FAILURE : SUCCESS);
230226
}
231227

232-
DBA_FIRSTKEY_FUNC(dbm)
228+
DBA_FIRSTKEY_FUNC(flatfile)
233229
{
234230
DBM_DATA;
235231

@@ -244,7 +240,7 @@ DBA_FIRSTKEY_FUNC(dbm)
244240
return NULL;
245241
}
246242

247-
DBA_NEXTKEY_FUNC(dbm)
243+
DBA_NEXTKEY_FUNC(flatfile)
248244
{
249245
DBM_DATA;
250246
datum lkey;
@@ -264,13 +260,13 @@ DBA_NEXTKEY_FUNC(dbm)
264260
return NULL;
265261
}
266262

267-
DBA_OPTIMIZE_FUNC(dbm)
263+
DBA_OPTIMIZE_FUNC(flatfile)
268264
{
269265
/* dummy */
270266
return SUCCESS;
271267
}
272268

273-
DBA_SYNC_FUNC(dbm)
269+
DBA_SYNC_FUNC(flatfile)
274270
{
275271
/* dummy */
276272
return SUCCESS;

‎ext/dba/libflatfile/flatfile.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <unistd.h>
3737
#endif
3838

39-
#include "dbm.h"
39+
#include "flatfile.h"
4040

4141
/*
4242
* ret = -1 means that database was opened for read-only
@@ -46,7 +46,7 @@
4646

4747
/* {{{ dbm_file_store
4848
*/
49-
PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum, int mode TSRMLS_DC) {
49+
PHPAPI int dbm_file_store(flatfile *dba, datum key_datum, datum value_datum, int mode TSRMLS_DC) {
5050
if (mode == DBM_INSERT) {
5151
if (dbm_file_findkey(dba, key_datum TSRMLS_CC)) {
5252
return 1;
@@ -77,7 +77,7 @@ PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum,
7777

7878
/* {{{ dbm_file_fetch
7979
*/
80-
PHPAPI datum dbm_file_fetch(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
80+
PHPAPI datum dbm_file_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
8181
datum value_datum = {NULL, 0};
8282
int num=0, buf_size=1024;
8383
char *buf;
@@ -105,7 +105,7 @@ PHPAPI datum dbm_file_fetch(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
105105

106106
/* {{{ dbm_file_delete
107107
*/
108-
PHPAPI int dbm_file_delete(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
108+
PHPAPI int dbm_file_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
109109
char *key = key_datum.dptr;
110110
int size = key_datum.dsize;
111111

@@ -164,7 +164,7 @@ PHPAPI int dbm_file_delete(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
164164

165165
/* {{{ dbm_file_findkey
166166
*/
167-
PHPAPI int dbm_file_findkey(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
167+
PHPAPI int dbm_file_findkey(flatfile *dba, datum key_datum TSRMLS_DC) {
168168
char *buf = NULL;
169169
int num;
170170
int buf_size=1024;
@@ -211,7 +211,7 @@ PHPAPI int dbm_file_findkey(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
211211

212212
/* {{{ dbm_file_firstkey
213213
*/
214-
PHPAPI datum dbm_file_firstkey(dba_dbm_data *dba TSRMLS_DC) {
214+
PHPAPI datum dbm_file_firstkey(flatfile *dba TSRMLS_DC) {
215215
datum buf;
216216
int num;
217217
int buf_size=1024;
@@ -252,7 +252,7 @@ PHPAPI datum dbm_file_firstkey(dba_dbm_data *dba TSRMLS_DC) {
252252

253253
/* {{{ latfile_nextkey
254254
*/
255-
PHPAPI datum dbm_file_nextkey(dba_dbm_data *dba TSRMLS_DC) {
255+
PHPAPI datum dbm_file_nextkey(flatfile *dba TSRMLS_DC) {
256256
datum buf;
257257
int num;
258258
int buf_size=1024;

‎ext/dba/libflatfile/flatfile.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ typedef struct {
3232
php_stream *fp;
3333
long CurrentFlatFilePos;
3434
datum nextkey;
35-
} dba_dbm_data;
35+
} flatfile;
3636

3737
#define DBM_INSERT 0
3838
#define DBM_REPLACE 1
3939

40-
PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum, int mode TSRMLS_DC);
41-
PHPAPI datum dbm_file_fetch(dba_dbm_data *dba, datum key_datum TSRMLS_DC);
42-
PHPAPI int dbm_file_delete(dba_dbm_data *dba, datum key_datum TSRMLS_DC);
43-
PHPAPI int dbm_file_findkey(dba_dbm_data *dba, datum key_datum TSRMLS_DC);
44-
PHPAPI datum dbm_file_firstkey(dba_dbm_data *dba TSRMLS_DC);
45-
PHPAPI datum dbm_file_nextkey(dba_dbm_data *dba TSRMLS_DC);
40+
PHPAPI int dbm_file_store(flatfile *dba, datum key_datum, datum value_datum, int mode TSRMLS_DC);
41+
PHPAPI datum dbm_file_fetch(flatfile *dba, datum key_datum TSRMLS_DC);
42+
PHPAPI int dbm_file_delete(flatfile *dba, datum key_datum TSRMLS_DC);
43+
PHPAPI int dbm_file_findkey(flatfile *dba, datum key_datum TSRMLS_DC);
44+
PHPAPI datum dbm_file_firstkey(flatfile *dba TSRMLS_DC);
45+
PHPAPI datum dbm_file_nextkey(flatfile *dba TSRMLS_DC);
4646

4747
#endif

0 commit comments

Comments
 (0)