VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/libzip/zip_stat_init.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/libzip/zip_stat_init.c')
-rw-r--r--src/Common/libzip/zip_stat_init.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/Common/libzip/zip_stat_init.c b/src/Common/libzip/zip_stat_init.c
index 6b7d6337..9c6088a7 100644
--- a/src/Common/libzip/zip_stat_init.c
+++ b/src/Common/libzip/zip_stat_init.c
@@ -1,9 +1,9 @@
/*
zip_stat_init.c -- initialize struct zip_stat.
- Copyright (C) 2006-2014 Dieter Baron and Thomas Klausner
+ Copyright (C) 2006-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
@@ -37,8 +37,7 @@
ZIP_EXTERN void
-zip_stat_init(zip_stat_t *st)
-{
+zip_stat_init(zip_stat_t *st) {
st->valid = 0;
st->name = NULL;
st->index = ZIP_UINT64_MAX;
@@ -52,8 +51,7 @@ zip_stat_init(zip_stat_t *st)
int
-_zip_stat_merge(zip_stat_t *dst, const zip_stat_t *src, zip_error_t *error)
-{
+_zip_stat_merge(zip_stat_t *dst, const zip_stat_t *src, zip_error_t *error) {
/* name is not merged, since zip_stat_t doesn't own it, and src may not be valid as long as dst */
if (src->valid & ZIP_STAT_INDEX) {
dst->index = src->index;
@@ -80,6 +78,6 @@ _zip_stat_merge(zip_stat_t *dst, const zip_stat_t *src, zip_error_t *error)
dst->flags = src->flags;
}
dst->valid |= src->valid;
-
+
return 0;
}