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_crc.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_crc.c')
| -rw-r--r-- | ext/zip/lib/zip_source_crc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/zip/lib/zip_source_crc.c b/ext/zip/lib/zip_source_crc.c index 7d6df6a385..739be28021 100644 --- a/ext/zip/lib/zip_source_crc.c +++ b/ext/zip/lib/zip_source_crc.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 <stdlib.h> #include <string.h> @@ -49,7 +49,7 @@ struct crc_context { static zip_int64_t crc_read(struct zip_source *, void *, void * , zip_uint64_t, enum zip_source_cmd); - + struct zip_source * zip_source_crc(struct zip *za, struct zip_source *src, int validate) @@ -71,11 +71,11 @@ zip_source_crc(struct zip *za, struct zip_source *src, int validate) ctx->e[0] = ctx->e[1] = 0; ctx->size = 0; ctx->crc = 0; - + return zip_source_layered(za, src, crc_read, ctx); } - + static zip_int64_t crc_read(struct zip_source *src, void *_ctx, void *data, @@ -112,13 +112,13 @@ crc_read(struct zip_source *src, void *_ctx, void *data, if ((st.valid & ZIP_STAT_CRC) && st.crc != ctx->crc) { ctx->e[0] = ZIP_ER_CRC; ctx->e[1] = 0; - + return -1; } if ((st.valid & ZIP_STAT_SIZE) && st.size != ctx->size) { ctx->e[0] = ZIP_ER_INCONS; ctx->e[1] = 0; - + return -1; } } @@ -150,7 +150,7 @@ crc_read(struct zip_source *src, void *_ctx, void *data, } } return 0; - + case ZIP_SOURCE_ERROR: memcpy(data, ctx->e, sizeof(ctx->e)); return 0; @@ -162,5 +162,5 @@ crc_read(struct zip_source *src, void *_ctx, void *data, default: return -1; } - + } |