1 files changed, 31 insertions, 34 deletions
diff --git a/src/Common/libzip/zip_file_replace.c b/src/Common/libzip/zip_file_replace.c
index e430efae..4262d453 100644
--- a/src/Common/libzip/zip_file_replace.c
+++ b/src/Common/libzip/zip_file_replace.c
@@ -1,10 +1,10 @@
 /*
   zip_file_replace.c -- replace file via callback function
-  Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2021 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>
+  The authors can be contacted at <info@libzip.org>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
@@ -16,9 +16,9 @@
      distribution.
   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
   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
@@ -35,74 +35,71 @@
 #include "zipint.h"
 
 
 ZIP_EXTERN int
-zip_file_replace(zip_t *za, zip_uint64_t idx, zip_source_t *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);
-	return -1;
+        zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+        return -1;
     }
 
     if (_zip_file_replace(za, idx, NULL, source, flags) == -1)
-	return -1;
+        return -1;
 
     return 0;
 }
 
 
-
 /* NOTE: Signed due to -1 on error.  See zip_add.c for more details. */
 
 zip_int64_t
-_zip_file_replace(zip_t *za, zip_uint64_t idx, const char *name, zip_source_t *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);
-	return -1;
+        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);
-
-	if (i == -1) {
-	    /* create and use new entry, used by zip_add */
-	    if ((i=_zip_add_entry(za)) < 0)
-		return -1;
-	}
-	idx = (zip_uint64_t)i;
+        zip_int64_t i = -1;
+
+        if (flags & ZIP_FL_OVERWRITE)
+            i = _zip_name_locate(za, name, flags, NULL);
+
+        if (i == -1) {
+            /* create and use new entry, used by zip_add */
+            if ((i = _zip_add_entry(za)) < 0)
+                return -1;
+        }
+        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);
-	    za->nentry = za_nentry_prev;
-	}
-	return -1;
+        if (za->nentry != za_nentry_prev) {
+            _zip_entry_finalize(za->entry + idx);
+            za->nentry = za_nentry_prev;
+        }
+        return -1;
     }
 
     /* does not change any name related data, so we can do it here;
      * needed for a double add of the same file name */
-    _zip_unchange_data(za->entry+idx);
+    _zip_unchange_data(za->entry + idx);
 
     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) {
+            if ((za->entry[idx].changes = _zip_dirent_clone(za->entry[idx].orig)) == NULL) {
                 zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
                 return -1;
             }
         }
 
         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;
 }