diff options
| author | Anatol Belski <ab@php.net> | 2017-05-29 10:14:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-05-29 10:17:43 +0200 |
| commit | 32d7fa6f74b56fed8124d4dea0f98f0f9964a64e (patch) | |
| tree | fe60cfe3975d431f1307ce777e14012703596108 | |
| parent | 29248d52b2a0b0ecb6340a0a8f0056e156a59f8c (diff) | |
| download | php-git-32d7fa6f74b56fed8124d4dea0f98f0f9964a64e.tar.gz | |
further data type fixes to ext/dba
| -rw-r--r-- | ext/dba/dba.c | 6 | ||||
| -rw-r--r-- | ext/dba/dba_cdb.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index a925863111..5dd03e86d7 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -228,7 +228,7 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free) return len; } else { zval tmp; - int len; + size_t len; ZVAL_COPY(&tmp, key); convert_to_string(&tmp); @@ -613,7 +613,7 @@ dba_info *php_dba_find(const char* path) { zend_resource *le; dba_info *info; - int numitems, i; + zend_long numitems, i; numitems = zend_hash_next_free_element(&EG(regular_list)); for (i=1; i<numitems; i++) { @@ -642,7 +642,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) dba_info *info, *other; dba_handler *hptr; char *key = NULL, *error = NULL; - int keylen = 0; + size_t keylen = 0; int i; int lock_mode, lock_flag, lock_dbf = 0; char *file_mode; diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c index ce62bbe375..969cc51a6e 100644 --- a/ext/dba/dba_cdb.c +++ b/ext/dba/dba_cdb.c @@ -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) { +zend_off_t cdb_file_lseek(php_stream *fp, zend_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) { +zend_off_t cdb_file_lseek(int fd, zend_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) { #define CSEEK(n) do { \ if (n >= cdb->eod) return NULL; \ - if (cdb_file_lseek(cdb->file, (off_t)n, SEEK_SET) != (off_t) n) return NULL; \ + if (cdb_file_lseek(cdb->file, (zend_off_t)n, SEEK_SET) != (zend_off_t) n) return NULL; \ } while (0) |