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_err_str.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_err_str.c')
| -rw-r--r-- | ext/zip/lib/zip_err_str.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/zip/lib/zip_err_str.c b/ext/zip/lib/zip_err_str.c index 8fb60036e0..deac7004ba 100644 --- a/ext/zip/lib/zip_err_str.c +++ b/ext/zip/lib/zip_err_str.c @@ -5,7 +5,7 @@ #include "zipint.h" - + const char * const _zip_err_str[] = { "No error", @@ -33,7 +33,7 @@ const char * const _zip_err_str[] = { "Can't remove file", "Entry has been deleted", "Encryption method not supported", - "Read-only archive", + "Read-only archive", "No password provided", "Wrong password provided", }; @@ -70,7 +70,7 @@ const int _zip_err_type[] = { S, N, N, - N, + N, N, N, }; |