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_memdup.c | |
| parent | 31f516b4888fcf096fe0912828948bed84f2ad1c (diff) | |
| download | php-git-9e0cc7a1d926c1364a834177cadea431cd8b39a7.tar.gz | |
update libzip to version 1.0.1
Diffstat (limited to 'ext/zip/lib/zip_memdup.c')
| -rw-r--r-- | ext/zip/lib/zip_memdup.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/zip/lib/zip_memdup.c b/ext/zip/lib/zip_memdup.c index 4faa8982cb..cc6d767d91 100644 --- a/ext/zip/lib/zip_memdup.c +++ b/ext/zip/lib/zip_memdup.c @@ -1,6 +1,6 @@ /* zip_memdup.c -- internal zip function, "strdup" with len - Copyright (C) 1999-2012 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 @@ -37,9 +37,8 @@ #include "zipint.h" - void * -_zip_memdup(const void *mem, size_t len, struct zip_error *error) +_zip_memdup(const void *mem, size_t len, zip_error_t *error) { void *ret; @@ -48,7 +47,7 @@ _zip_memdup(const void *mem, size_t len, struct zip_error *error) ret = malloc(len); if (!ret) { - _zip_error_set(error, ZIP_ER_MEMORY, 0); + zip_error_set(error, ZIP_ER_MEMORY, 0); return NULL; } |