diff options
Diffstat (limited to 'ext/zip/lib/zip_source_error.c')
| -rw-r--r-- | ext/zip/lib/zip_source_error.c | 52 |
1 files changed, 5 insertions, 47 deletions
diff --git a/ext/zip/lib/zip_source_error.c b/ext/zip/lib/zip_source_error.c index 87ac7fa141..e09199bbef 100644 --- a/ext/zip/lib/zip_source_error.c +++ b/ext/zip/lib/zip_source_error.c @@ -1,6 +1,6 @@ /* zip_source_error.c -- get last error from zip_source - Copyright (C) 2009-2015 Dieter Baron and Thomas Klausner + Copyright (C) 2009-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,53 +32,11 @@ */ - #include "zipint.h" - -void -zip_source_error(struct zip_source *src, int *ze, int *se) +zip_error_t * +zip_source_error(zip_source_t *src) { - int e[2]; - - if (src->src == NULL) { - if (src->cb.f(src->ud, e, sizeof(e), ZIP_SOURCE_ERROR) < 0) { - e[0] = ZIP_ER_INTERNAL; - e[1] = 0; - } - } - else { - switch (src->error_source) { - case ZIP_LES_NONE: - e[0] = e[1] = 0; - break; - - case ZIP_LES_INVAL: - e[0] = ZIP_ER_INVAL; - e[1] = 0; - break; - - case ZIP_LES_LOWER: - zip_source_error(src->src, ze, se); - return; - - case ZIP_LES_UPPER: - if (src->cb.l(src->src, src->ud, e, sizeof(e), ZIP_SOURCE_ERROR) < 0) { - e[0] = ZIP_ER_INTERNAL; - e[1] = 0; - } - break; - - default: - e[0] = ZIP_ER_INTERNAL; - e[1] = 0; - break; - } - } - - if (ze) - *ze = e[0]; - if (se) - *se = e[1]; + return &src->error; } |