update libzip to version 1.0.1

1 files changed, 11 insertions, 14 deletions

diff --git a/ext/zip/lib/zip_file_replace.c b/ext/zip/lib/zip_file_replace.c
index 622ef3c992..e430efae9e 100644
--- a/ext/zip/lib/zip_file_replace.c
+++ b/ext/zip/lib/zip_file_replace.c
@@ -1,6 +1,6 @@
 /*
   zip_file_replace.c -- replace file via callback function
-  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
@@ -32,16 +32,14 @@
 */
 
 
-
 #include "zipint.h"
 
 
-
 ZIP_EXTERN int
-zip_file_replace(struct zip *za, zip_uint64_t idx, struct zip_source *source, zip_flags_t flags)
+zip_file_replace(zip_t *za, zip_uint64_t idx, zip_source_t *source, zip_flags_t flags)
 {
     if (idx >= za->nentry || source == NULL) {
-	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
     }
 
@@ -53,23 +51,22 @@ zip_file_replace(struct zip *za, zip_uint64_t idx, struct zip_source *source, zi
 
 
 
-
 /* NOTE: Signed due to -1 on error.  See zip_add.c for more details. */
 
 zip_int64_t
-_zip_file_replace(struct zip *za, zip_uint64_t idx, const char *name, struct zip_source *source, zip_flags_t flags)
+_zip_file_replace(zip_t *za, zip_uint64_t idx, const char *name, zip_source_t *source, zip_flags_t flags)
 {
     zip_uint64_t za_nentry_prev;
-
+    
     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;
     }
 
     za_nentry_prev = za->nentry;
     if (idx == ZIP_UINT64_MAX) {
 	zip_int64_t i = -1;
-
+	
 	if (flags & ZIP_FL_OVERWRITE)
 	    i = _zip_name_locate(za, name, flags, NULL);
 
@@ -80,7 +77,7 @@ _zip_file_replace(struct zip *za, zip_uint64_t idx, const char *name, struct zip
 	}
 	idx = (zip_uint64_t)i;
     }
-
+    
     if (name && _zip_set_name(za, idx, name, flags) != 0) {
 	if (za->nentry != za_nentry_prev) {
 	    _zip_entry_finalize(za->entry+idx);
@@ -96,7 +93,7 @@ _zip_file_replace(struct zip *za, zip_uint64_t idx, const char *name, struct zip
     if (za->entry[idx].orig != NULL && (za->entry[idx].changes == NULL || (za->entry[idx].changes->changed & ZIP_DIRENT_COMP_METHOD) == 0)) {
         if (za->entry[idx].changes == NULL) {
             if ((za->entry[idx].changes=_zip_dirent_clone(za->entry[idx].orig)) == NULL) {
-                _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+                zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
                 return -1;
             }
         }
@@ -104,7 +101,7 @@ _zip_file_replace(struct zip *za, zip_uint64_t idx, const char *name, struct zip
         za->entry[idx].changes->comp_method = ZIP_CM_REPLACED_DEFAULT;
         za->entry[idx].changes->changed |= ZIP_DIRENT_COMP_METHOD;
     }
-
+	
     za->entry[idx].source = source;
 
     return (zip_int64_t)idx;