commit 851aebe285de224cf0fb20b8c37cab09525e8f7a
author Thomas Klausner <tk@giga.or.at> Fri Apr 24 12:36:25 2015 +0200
committer Thomas Klausner <tk@giga.or.at> Fri Apr 24 12:36:25 2015 +0200
tree 470220769ef74377b1a190189e7ff65eed1d8873
parent 0ce25174ea73e02419343dcd130bb327ee662a4c

Remove function argument that always gets passed '1'.

lib/zip_source_file.c

diff --git a/lib/zip_source_file.c b/lib/zip_source_file.c
index cefc2b4..37bd270 100644
--- a/lib/zip_source_file.c
+++ b/lib/zip_source_file.c
@@ -56,5 +56,5 @@
 	return NULL;
     }
 
-    return _zip_source_file_or_p(fname, NULL, start, length, 1, NULL, error);
+    return _zip_source_file_or_p(fname, NULL, start, length, NULL, error);
 }

lib/zip_source_filep.c

diff --git a/lib/zip_source_filep.c b/lib/zip_source_filep.c
index d8310c8..2f88c0f 100644
--- a/lib/zip_source_filep.c
+++ b/lib/zip_source_filep.c
@@ -92,12 +92,12 @@
 	return NULL;
     }
 
-    return _zip_source_file_or_p(NULL, file, start, length, 1, NULL, error);
+    return _zip_source_file_or_p(NULL, file, start, length, NULL, error);
 }
 
 
 zip_source_t *
-_zip_source_file_or_p(const char *fname, FILE *file, zip_uint64_t start, zip_int64_t len, int closep, const zip_stat_t *st, zip_error_t *error)
+_zip_source_file_or_p(const char *fname, FILE *file, zip_uint64_t start, zip_int64_t len, const zip_stat_t *st, zip_error_t *error)
 {
     struct read_file *ctx;
     zip_source_t *zs;
@@ -123,7 +123,7 @@
     ctx->f = file;
     ctx->start = start;
     ctx->end = (len < 0 ? 0 : start+(zip_uint64_t)len);
-    ctx->closep = ctx->fname ? 1 : closep;
+    ctx->closep = 1;
     if (st) {
 	memcpy(&ctx->st, st, sizeof(ctx->st));
         ctx->st.name = NULL;

lib/zipint.h

diff --git a/lib/zipint.h b/lib/zipint.h
index 3bcd8de..10ffff1 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h
@@ -517,7 +517,7 @@
 void _zip_set_open_error(int *zep, const zip_error_t *err, int ze);
 
 zip_int64_t _zip_source_call(zip_source_t *src, void *data, zip_uint64_t length, zip_source_cmd_t command);
-zip_source_t *_zip_source_file_or_p(const char *, FILE *, zip_uint64_t, zip_int64_t, int, const zip_stat_t *, zip_error_t *error);
+zip_source_t *_zip_source_file_or_p(const char *, FILE *, zip_uint64_t, zip_int64_t, const zip_stat_t *, zip_error_t *error);
 void _zip_source_invalidate(zip_source_t *src);
 zip_source_t *_zip_source_new(zip_error_t *error);
 int _zip_source_set_source_archive(zip_source_t *, zip_t *);