From: Stephan Beyer <s-beyer@gmx.net>
Date: Tue, 7 Jul 2020 07:10:48 +0000 (+0200)
Subject: Make csync_file_stat_s::isE2eEncrypted a bitfield
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~96
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a87b6157ee42be528c4c2b94337833e0a5ad1aa7;p=nextcloud-desktop.git

Make csync_file_stat_s::isE2eEncrypted a bitfield

This is in line with other bools of that struct and gets rid
of clang-tidy's modernize-use-default-member-init warning.
(The trivial alternative to get rid of that warning would be
to use default member init for that bool variable, but I think
it is better to have it as a bitfield.)

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---

diff --git a/src/csync/csync.h b/src/csync/csync.h
index 97895b2c2..eab9699b1 100644
--- a/src/csync/csync.h
+++ b/src/csync/csync.h
@@ -158,6 +158,7 @@ struct OCSYNC_EXPORT csync_file_stat_s {
   bool child_modified BITFIELD(1);
   bool has_ignored_files BITFIELD(1); // Specify that a directory, or child directory contains ignored files.
   bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
+  bool isE2eEncrypted BITFIELD(1);
 
   QByteArray path;
   QByteArray rename_path;
@@ -173,7 +174,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
   // In both cases, the format is "SHA1:baff".
   QByteArray checksumHeader;
   QByteArray e2eMangledName;
-  bool isE2eEncrypted;
 
   CSYNC_STATUS error_status = CSYNC_STATUS_OK;