diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-04 14:13:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-04 14:13:08 +0800 |
| commit | 2bac0452145604e3a8e1bd557dbf0aef09fc5222 (patch) | |
| tree | 9fcce9363434960e3b082ffe0051d8ddfc57b37a /ext/zip/lib | |
| parent | ec69cb664fa67acde35aa2fe3872f34269057940 (diff) | |
| parent | 6687e8db151907dab2447e5baa81693bcff98612 (diff) | |
| download | php-git-2bac0452145604e3a8e1bd557dbf0aef09fc5222.tar.gz | |
Merge branch 'clean-up' of https://github.com/carusogabriel/php-src
* 'clean-up' of https://github.com/carusogabriel/php-src:
Trailing whitespaces on Zend
Trailing whitespaces on win32
Trailing whitespaces on sapi/*
Trailing whitespaces on ext/*
Diffstat (limited to 'ext/zip/lib')
| -rw-r--r-- | ext/zip/lib/zip.h | 6 | ||||
| -rw-r--r-- | ext/zip/lib/zipint.h | 6 | ||||
| -rw-r--r-- | ext/zip/lib/zipwin32.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/zip/lib/zip.h b/ext/zip/lib/zip.h index 7b243bcd05..cd10ca94b8 100644 --- a/ext/zip/lib/zip.h +++ b/ext/zip/lib/zip.h @@ -20,7 +20,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 @@ -127,7 +127,7 @@ extern "C" { #define ZIP_ER_REMOVE 22 /* S Can't remove file */ #define ZIP_ER_DELETED 23 /* N Entry has been deleted */ #define ZIP_ER_ENCRNOTSUPP 24 /* N Encryption method not supported */ -#define ZIP_ER_RDONLY 25 /* N Read-only archive */ +#define ZIP_ER_RDONLY 25 /* N Read-only archive */ #define ZIP_ER_NOPASSWD 26 /* N No password provided */ #define ZIP_ER_WRONGPASSWD 27 /* N Wrong password provided */ #define ZIP_ER_OPNOTSUPP 28 /* N Operation not supported */ @@ -299,7 +299,7 @@ typedef struct zip_file zip_file_t; typedef struct zip_source zip_source_t; typedef struct zip_stat zip_stat_t; -typedef zip_uint32_t zip_flags_t; +typedef zip_uint32_t zip_flags_t; typedef zip_int64_t (*zip_source_callback)(void *, void *, zip_uint64_t, zip_source_cmd_t); diff --git a/ext/zip/lib/zipint.h b/ext/zip/lib/zipint.h index 0ae30a9e8a..6a12c2fb8c 100644 --- a/ext/zip/lib/zipint.h +++ b/ext/zip/lib/zipint.h @@ -20,7 +20,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 @@ -313,7 +313,7 @@ struct zip { zip_source_t **open_source; /* open sources using archive */ zip_hash_t *names; /* hash table for name lookup */ - + char *tempdir; /* custom temp dir (needed e.g. for OS X sandboxing) */ }; @@ -432,7 +432,7 @@ struct zip_string { struct zip_buffer { bool ok; bool free_data; - + zip_uint8_t *data; zip_uint64_t size; zip_uint64_t offset; diff --git a/ext/zip/lib/zipwin32.h b/ext/zip/lib/zipwin32.h index 4fa29cceee..166ace9e49 100644 --- a/ext/zip/lib/zipwin32.h +++ b/ext/zip/lib/zipwin32.h @@ -20,7 +20,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 |