diff options
| author | Remi Collet <remi@fedoraproject.org> | 2015-05-06 14:36:18 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-05-06 15:16:43 +0200 |
| commit | 9e0cc7a1d926c1364a834177cadea431cd8b39a7 (patch) | |
| tree | f63c505073d6aa0b74bde71eb6a67e6e4c23d8bd /ext/zip/lib/zip_error_to_str.c | |
| parent | 31f516b4888fcf096fe0912828948bed84f2ad1c (diff) | |
| download | php-git-9e0cc7a1d926c1364a834177cadea431cd8b39a7.tar.gz | |
update libzip to version 1.0.1
Diffstat (limited to 'ext/zip/lib/zip_error_to_str.c')
| -rw-r--r-- | ext/zip/lib/zip_error_to_str.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ext/zip/lib/zip_error_to_str.c b/ext/zip/lib/zip_error_to_str.c index c61e2d0c9e..d4119253f7 100644 --- a/ext/zip/lib/zip_error_to_str.c +++ b/ext/zip/lib/zip_error_to_str.c @@ -1,6 +1,6 @@ /* zip_error_to_str.c -- get string representation of zip error code - Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner + Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at <libzip@nih.at> @@ -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 @@ -32,16 +32,15 @@ */ - #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#define _ZIP_COMPILING_DEPRECATED #include "zipint.h" - ZIP_EXTERN int zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) { @@ -51,16 +50,16 @@ zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) return snprintf(buf, len, "Unknown error %d", ze); zs = _zip_err_str[ze]; - + switch (_zip_err_type[ze]) { case ZIP_ET_SYS: ss = strerror(se); break; - + case ZIP_ET_ZLIB: ss = zError(se); break; - + default: ss = NULL; } |