Imported Upstream version 1.9.1

[platform/upstream/libzip.git] / lib / zip_fread.c

diff --git a/lib/zip_fread.c b/lib/zip_fread.c
index 9c1cbe0..22fabe3 100644 (file)
--- a/lib/zip_fread.c
+++ b/lib/zip_fread.c
@@ -1,9 +1,9 @@
 /*
   zip_fread.c -- read from file
-  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
@@ -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
@@ -36,27 +36,26 @@
 
 
 ZIP_EXTERN zip_int64_t
-zip_fread(zip_file_t *zf, void *outbuf, zip_uint64_t toread)
-{
+zip_fread(zip_file_t *zf, void *outbuf, zip_uint64_t toread) {
     zip_int64_t n;
 
     if (!zf)
-       return -1;
+        return -1;
 
     if (zf->error.zip_err != 0)
-       return -1;
+        return -1;
 
     if (toread > ZIP_INT64_MAX) {
-       zip_error_set(&zf->error, ZIP_ER_INVAL, 0);
-       return -1;
+        zip_error_set(&zf->error, ZIP_ER_INVAL, 0);
+        return -1;
     }
 
     if ((zf->eof) || (toread == 0))
-       return 0;
+        return 0;
 
-    if ((n=zip_source_read(zf->src, outbuf, toread)) < 0) {
-       _zip_error_set_from_source(&zf->error, zf->src);
-       return -1;
+    if ((n = zip_source_read(zf->src, outbuf, toread)) < 0) {
+        _zip_error_set_from_source(&zf->error, zf->src);
+        return -1;
     }
 
     return n;