diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 15:12:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 15:12:13 +0200 |
| commit | 8704e392a1283ca5509a0785fd87f5a39d96036f (patch) | |
| tree | 136f1e23a67f32f5d8103851cb67eb037619ec13 /ext/phar/dirstream.c | |
| parent | 398a1cc655c4b5076aac2492765da154f9fad9e5 (diff) | |
| download | php-git-8704e392a1283ca5509a0785fd87f5a39d96036f.tar.gz | |
ported ext/phar
Diffstat (limited to 'ext/phar/dirstream.c')
| -rw-r--r-- | ext/phar/dirstream.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index d24a4c76da..53e6175ecb 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -58,7 +58,7 @@ static int phar_dir_close(php_stream *stream, int close_handle TSRMLS_DC) /* {{ /** * Used for seeking on a phar directory handle */ -static int phar_dir_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset TSRMLS_DC) /* {{{ */ +static int phar_dir_seek(php_stream *stream, php_off_t offset, int whence, php_off_t *newoffset TSRMLS_DC) /* {{{ */ { HashTable *data = (HashTable *)stream->abstract; @@ -95,7 +95,7 @@ static size_t phar_dir_read(php_stream *stream, char *buf, size_t count TSRMLS_D size_t to_read; HashTable *data = (HashTable *)stream->abstract; zend_string *str_key; - ulong unused; + php_uint_t unused; if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(data, &str_key, &unused, 0, &data->nInternalPointer)) { return 0; @@ -184,7 +184,7 @@ static php_stream *phar_make_dirstream(char *dir, HashTable *manifest TSRMLS_DC) char *entry, *found, *save; zend_string *str_key; uint keylen; - ulong unused; + php_uint_t unused; ALLOC_HASHTABLE(data); zend_hash_init(data, 64, NULL, NULL, 0); @@ -306,7 +306,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, const char *path, php_stream *ret; char *internal_file, *error; zend_string *str_key; - ulong unused; + php_uint_t unused; phar_archive_data *phar; phar_entry_info *entry = NULL; uint host_len; @@ -550,7 +550,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, int options php_url *resource = NULL; uint host_len; zend_string *str_key; - ulong unused; + php_uint_t unused; uint path_len; /* pre-readonly check, we need to know if this is a data phar */ |