summaryrefslogtreecommitdiff
path: root/ext/zip/lib/zip_dir_add.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/zip/lib/zip_dir_add.c')
-rw-r--r--ext/zip/lib/zip_dir_add.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/zip/lib/zip_dir_add.c b/ext/zip/lib/zip_dir_add.c
index 6a5a579851..f535b21f21 100644
--- a/ext/zip/lib/zip_dir_add.c
+++ b/ext/zip/lib/zip_dir_add.c
@@ -1,6 +1,6 @@
/*
zip_dir_add.c -- add directory
- Copyright (C) 1999-2015 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>
@@ -31,32 +31,30 @@
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#include <stdlib.h>
#include <string.h>
#include "zipint.h"
-
/* NOTE: Signed due to -1 on error. See zip_add.c for more details. */
ZIP_EXTERN zip_int64_t
-zip_dir_add(struct zip *za, const char *name, zip_flags_t flags)
+zip_dir_add(zip_t *za, const char *name, zip_flags_t flags)
{
size_t len;
zip_int64_t idx;
char *s;
- struct zip_source *source;
+ zip_source_t *source;
if (ZIP_IS_RDONLY(za)) {
- _zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
+ zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
return -1;
}
if (name == NULL) {
- _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+ zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1;
}
@@ -65,7 +63,7 @@ zip_dir_add(struct zip *za, const char *name, zip_flags_t flags)
if (name[len-1] != '/') {
if ((s=(char *)malloc(len+2)) == NULL) {
- _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+ zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
return -1;
}
strcpy(s, name);