diff options
| author | Alaa Eddine Elamri <alaeddine.elamri@bareos.com> | 2022-10-06 11:49:13 +0300 |
|---|---|---|
| committer | Andreas Rogge <andreas.rogge@bareos.com> | 2022-11-07 19:16:27 +0300 |
| commit | 74ff88ea658f8e48a850a4d301f16fe700625781 (patch) | |
| tree | 8fcfa4f2e3695e2b21ca924250c53e35821f7553 /core | |
| parent | d988217814df77e87aa2179eff393867c15bdcb5 (diff) | |
windows: fix windows complaints
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/dird/fd_cmds.cc | 2 | ||||
| -rw-r--r-- | core/src/tests/version_strings.cc | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/core/src/dird/fd_cmds.cc b/core/src/dird/fd_cmds.cc index a8d65cc78..f11ceec3f 100644 --- a/core/src/dird/fd_cmds.cc +++ b/core/src/dird/fd_cmds.cc @@ -192,7 +192,7 @@ static void SendInfoSuccess(JobControlRecord* jcr, UaContext* ua) std::string m; if (jcr->impl->res.client->connection_successful_handshake_ == ClientConnectionHandshakeMode::kUndefined) { - m += "\r\v"; + m = "\r\v"; } switch (jcr->impl->connection_handshake_try_) { case ClientConnectionHandshakeMode::kTlsFirst: diff --git a/core/src/tests/version_strings.cc b/core/src/tests/version_strings.cc index 43a30be95..981b557c0 100644 --- a/core/src/tests/version_strings.cc +++ b/core/src/tests/version_strings.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2019-2019 Bareos GmbH & Co. KG + Copyright (C) 2019-2022 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,20 +18,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <algorithm> -#include <vector> - -#if defined(HAVE_MINGW) -# include "include/bareos.h" -# include "gtest/gtest.h" -#else -# include "gtest/gtest.h" -# include "include/bareos.h" -#endif +#include "include/bareos.h" +#include "gtest/gtest.h" #include "lib/version.h" +#include <algorithm> +#include <vector> + TEST(version_strings, version) { std::string ver_full{kBareosVersionStrings.Full}; |