diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/zip/lib/zip_source_filep.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/zip/lib/zip_source_filep.c')
| -rw-r--r-- | ext/zip/lib/zip_source_filep.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/zip/lib/zip_source_filep.c b/ext/zip/lib/zip_source_filep.c index fcebe73bc6..9b1af4da05 100644 --- a/ext/zip/lib/zip_source_filep.c +++ b/ext/zip/lib/zip_source_filep.c @@ -17,7 +17,7 @@ 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -31,7 +31,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + #include <sys/stat.h> #include <errno.h> @@ -56,7 +56,7 @@ struct read_file { static zip_int64_t read_file(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd); - + ZIP_EXTERN struct zip_source * zip_source_filep(struct zip *za, FILE *file, zip_uint64_t start, @@ -73,7 +73,7 @@ zip_source_filep(struct zip *za, FILE *file, zip_uint64_t start, return _zip_source_file_or_p(za, NULL, file, start, len, 1, NULL); } - + struct zip_source * _zip_source_file_or_p(struct zip *za, const char *fname, FILE *file, @@ -118,7 +118,7 @@ _zip_source_file_or_p(struct zip *za, const char *fname, FILE *file, return zs; } - + static zip_int64_t read_file(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) @@ -150,13 +150,13 @@ read_file(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) } z->remain = z->len; return 0; - + case ZIP_SOURCE_READ: if (z->remain != -1) n = len > (zip_uint64_t)z->remain ? (zip_uint64_t)z->remain : len; else n = len; - + if (n > SIZE_MAX) n = SIZE_MAX; @@ -181,7 +181,7 @@ read_file(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) z->remain -= i; return (zip_int64_t)i; - + case ZIP_SOURCE_CLOSE: if (z->fname) { fclose(z->f); @@ -200,7 +200,7 @@ read_file(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) struct zip_stat *st; struct stat fst; int err; - + if (z->f) err = fstat(fileno(z->f), &fst); else @@ -213,7 +213,7 @@ read_file(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) } st = (struct zip_stat *)data; - + zip_stat_init(st); st->mtime = fst.st_mtime; st->valid |= ZIP_STAT_MTIME; |