diff options
Diffstat (limited to 'ext/dba/dba_cdb.c')
| -rw-r--r-- | ext/dba/dba_cdb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c index 17419dcf2e..deab119861 100644 --- a/ext/dba/dba_cdb.c +++ b/ext/dba/dba_cdb.c @@ -104,9 +104,9 @@ DBA_OPEN_FUNC(cdb) #if DBA_CDB_BUILTIN if (make) { - cdb_make_start(&cdb->m, file TSRMLS_CC); + cdb_make_start(&cdb->m, file); } else { - cdb_init(&cdb->c, file TSRMLS_CC); + cdb_init(&cdb->c, file); } cdb->make = make; #else @@ -125,9 +125,9 @@ DBA_CLOSE_FUNC(cdb) /* cdb_free does not close associated file */ #if DBA_CDB_BUILTIN if (cdb->make) { - cdb_make_finish(&cdb->m TSRMLS_CC); + cdb_make_finish(&cdb->m); } else { - cdb_free(&cdb->c TSRMLS_CC); + cdb_free(&cdb->c); } #else cdb_free(&cdb->c); @@ -137,9 +137,9 @@ DBA_CLOSE_FUNC(cdb) } #if DBA_CDB_BUILTIN -# define php_cdb_read(cdb, buf, len, pos) cdb_read(cdb, buf, len, pos TSRMLS_CC) -# define php_cdb_findnext(cdb, key, len) cdb_findnext(cdb, key, len TSRMLS_CC) -# define php_cdb_find(cdb, key, len) cdb_find(cdb, key, len TSRMLS_CC) +# define php_cdb_read(cdb, buf, len, pos) cdb_read(cdb, buf, len, pos) +# define php_cdb_findnext(cdb, key, len) cdb_findnext(cdb, key, len) +# define php_cdb_find(cdb, key, len) cdb_find(cdb, key, len) #else # define php_cdb_read(cdb, buf, len, pos) cdb_read(cdb, buf, len, pos) # define php_cdb_findnext(cdb, key, len) cdb_findnext(cdb, key, len) @@ -186,7 +186,7 @@ DBA_UPDATE_FUNC(cdb) return FAILURE; /* database was opened readonly */ if (!mode) return FAILURE; /* cdb_make dosn't know replace */ - if (cdb_make_add(&cdb->m, key, keylen, val, vallen TSRMLS_CC) != -1) + if (cdb_make_add(&cdb->m, key, keylen, val, vallen) != -1) return SUCCESS; #endif return FAILURE; @@ -225,12 +225,12 @@ DBA_DELETE_FUNC(cdb) /* {{{ cdb_file_lseek php_stream_seek does not return actual position */ #if DBA_CDB_BUILTIN -int cdb_file_lseek(php_stream *fp, off_t offset, int whence TSRMLS_DC) { +int cdb_file_lseek(php_stream *fp, off_t offset, int whence) { php_stream_seek(fp, offset, whence); return php_stream_tell(fp); } #else -int cdb_file_lseek(int fd, off_t offset, int whence TSRMLS_DC) { +int cdb_file_lseek(int fd, off_t offset, int whence) { return lseek(fd, offset, whence); } #endif @@ -238,7 +238,7 @@ int cdb_file_lseek(int fd, off_t offset, int whence TSRMLS_DC) { #define CSEEK(n) do { \ if (n >= cdb->eod) return NULL; \ - if (cdb_file_lseek(cdb->file, (off_t)n, SEEK_SET TSRMLS_CC) != (off_t) n) return NULL; \ + if (cdb_file_lseek(cdb->file, (off_t)n, SEEK_SET) != (off_t) n) return NULL; \ } while (0) |