From 0288e1ab643f4cebd9b05605eb9769c161a06035 Mon Sep 17 00:00:00 2001 From: Peter M. Groen Date: Sun, 15 Jan 2023 18:30:09 +0100 Subject: [PATCH] Fixed Loggin --- src/CMakeLists.txt | 1 + src/crypter.cpp | 28 +++------------------------- src/crypter.h | 22 ---------------------- src/scopeguard.cpp | 22 ---------------------- src/scopeguard.h | 24 +----------------------- 5 files changed, 5 insertions(+), 92 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 078670e..c5b0681 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,3 +32,4 @@ add_libraries( include(installation) install_component() + diff --git a/src/crypter.cpp b/src/crypter.cpp index fba2164..216c325 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -1,25 +1,3 @@ -/* **************************************************************************** - * Copyright 2019 Open Systems Development BV * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the "Software"), * - * to deal in the Software without restriction, including without limitation * - * the rights to use, copy, modify, merge, publish, distribute, sublicense, * - * and/or sell copies of the Software, and to permit persons to whom the * - * Software is furnished to do so, subject to the following conditions: * - * * - * The above copyright notice and this permission notice shall be included in * - * all copies or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * - * DEALINGS IN THE SOFTWARE. * - * ***************************************************************************/ - #include "crypter.h" // std @@ -103,7 +81,7 @@ std::string Crypter::encrypt( const std::string& message, Crypter::AlgorithmEnum auto errorCode = EVP_DigestInit_ex( mdContext.get(), md, NULL ); if( 1 != errorCode ) { - LogError( "[Crypter::encrypt]", QString( "No encryption digest environment created." ) ); + LogError( "[Crypter::encrypt]", std::string( "No encryption digest environment created." ) ); throw std::system_error( errorCode, std::system_category(), "No encryption digest environment created." ); } @@ -111,7 +89,7 @@ std::string Crypter::encrypt( const std::string& message, Crypter::AlgorithmEnum errorCode = EVP_DigestUpdate( mdContext.get(), message.c_str(), message.length() ); if( 1 != errorCode ) { - LogError( "[Crypter::encrypt]", QString("Digest failed.") ); + LogError( "[Crypter::encrypt]", std::string("Digest failed.") ); throw std::system_error( errorCode, std::system_category(), "Digest failed.." ); } @@ -121,7 +99,7 @@ std::string Crypter::encrypt( const std::string& message, Crypter::AlgorithmEnum errorCode = EVP_DigestFinal_ex( mdContext.get(), mdValue, &mdLen ); if( 1 != errorCode ) { - LogError( "[Crypter::encrypt]", QString("There was an error closing the digest environment.") ); + LogError( "[Crypter::encrypt]", std::string("There was an error closing the digest environment.") ); throw std::system_error( errorCode, std::system_category(), "There was an error closing the digest environment." ); } diff --git a/src/crypter.h b/src/crypter.h index f3f5d4b..cfa9cb3 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -1,25 +1,3 @@ -/* **************************************************************************** - * Copyright 2019 Open Systems Development BV * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the "Software"), * - * to deal in the Software without restriction, including without limitation * - * the rights to use, copy, modify, merge, publish, distribute, sublicense, * - * and/or sell copies of the Software, and to permit persons to whom the * - * Software is furnished to do so, subject to the following conditions: * - * * - * The above copyright notice and this permission notice shall be included in * - * all copies or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * - * DEALINGS IN THE SOFTWARE. * - * ***************************************************************************/ - #ifndef OSDEV_COMPONENTS_CRYPTER_H #define OSDEV_COMPONENTS_CRYPTER_H diff --git a/src/scopeguard.cpp b/src/scopeguard.cpp index 82455a4..4492602 100644 --- a/src/scopeguard.cpp +++ b/src/scopeguard.cpp @@ -1,25 +1,3 @@ -/* **************************************************************************** - * Copyright 2019 Open Systems Development BV * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the "Software"), * - * to deal in the Software without restriction, including without limitation * - * the rights to use, copy, modify, merge, publish, distribute, sublicense, * - * and/or sell copies of the Software, and to permit persons to whom the * - * Software is furnished to do so, subject to the following conditions: * - * * - * The above copyright notice and this permission notice shall be included in * - * all copies or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * - * DEALINGS IN THE SOFTWARE. * - * ***************************************************************************/ - #include "scopeguard.h" using namespace osdev::components; diff --git a/src/scopeguard.h b/src/scopeguard.h index 29366eb..ad60e02 100644 --- a/src/scopeguard.h +++ b/src/scopeguard.h @@ -1,25 +1,3 @@ -/* **************************************************************************** - * Copyright 2019 Open Systems Development BV * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the "Software"), * - * to deal in the Software without restriction, including without limitation * - * the rights to use, copy, modify, merge, publish, distribute, sublicense, * - * and/or sell copies of the Software, and to permit persons to whom the * - * Software is furnished to do so, subject to the following conditions: * - * * - * The above copyright notice and this permission notice shall be included in * - * all copies or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * - * DEALINGS IN THE SOFTWARE. * - * ***************************************************************************/ - #ifndef OSDEV_COMPONENTS_SCOPEGUARD_H #define OSDEV_COMPONENTS_SCOPEGUARD_H @@ -28,7 +6,7 @@ namespace osdev { namespace components { -using CleanUpFunction = std::function; +using CleanUpFunction = std::function; /** * @brief Ensures that a cleanup function is called at the end of the current scope. -- libgit2 0.21.4