aboutsummaryrefslogtreecommitdiff
path: root/nitrokey-sys/libnitrokey-v3.5/log.cc
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
committerDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
commitd0d9683df8398696147e7ee1fcffb2e4e957008c (patch)
tree4baa76712a76f4d072ee3936c07956580b230820 /nitrokey-sys/libnitrokey-v3.5/log.cc
parent203e691f46d591a2cc8acdfd850fa9f5b0fb8a98 (diff)
downloadnitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.gz
nitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.bz2
Remove vendored dependencies
While it appears that by now we actually can get successful builds without Cargo insisting on Internet access by virtue of using the --frozen flag, maintaining vendored dependencies is somewhat of a pain point. This state will also get worse with upcoming changes that replace argparse in favor of structopt and pull in a slew of new dependencies by doing so. Then there is also the repository structure aspect, which is non-standard due to the way we vendor dependencies and a potential source of confusion. In order to fix these problems, this change removes all the vendored dependencies we have. Delete subrepo argparse/:argparse Delete subrepo base32/:base32 Delete subrepo cc/:cc Delete subrepo cfg-if/:cfg-if Delete subrepo getrandom/:getrandom Delete subrepo lazy-static/:lazy-static Delete subrepo libc/:libc Delete subrepo nitrokey-sys/:nitrokey-sys Delete subrepo nitrokey/:nitrokey Delete subrepo rand/:rand
Diffstat (limited to 'nitrokey-sys/libnitrokey-v3.5/log.cc')
-rw-r--r--nitrokey-sys/libnitrokey-v3.5/log.cc103
1 files changed, 0 insertions, 103 deletions
diff --git a/nitrokey-sys/libnitrokey-v3.5/log.cc b/nitrokey-sys/libnitrokey-v3.5/log.cc
deleted file mode 100644
index 06acee7..0000000
--- a/nitrokey-sys/libnitrokey-v3.5/log.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2015-2018 Nitrokey UG
- *
- * This file is part of libnitrokey.
- *
- * libnitrokey is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * libnitrokey is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with libnitrokey. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-3.0
- */
-
-#include "log.h"
-#include <iostream>
-#include <ctime>
-#include <iomanip>
-
-#include <sstream>
-
-namespace nitrokey {
- namespace log {
-
- Log *Log::mp_instance = nullptr;
- StdlogHandler stdlog_handler;
-
- std::string Log::prefix = "";
-
-
- std::string LogHandler::loglevel_to_str(Loglevel lvl) {
- switch (lvl) {
- case Loglevel::DEBUG_L1:
- return std::string("DEBUG_L1");
- case Loglevel::DEBUG_L2:
- return std::string("DEBUG_L2");
- case Loglevel::DEBUG:
- return std::string("DEBUG");
- case Loglevel::INFO:
- return std::string("INFO");
- case Loglevel::WARNING:
- return std::string("WARNING");
- case Loglevel::ERROR:
- return std::string("ERROR");
- }
- return std::string("");
- }
-
- void Log::operator()(const std::string &logstr, Loglevel lvl) {
- if (mp_loghandler != nullptr){
- if ((int) lvl <= (int) m_loglevel) mp_loghandler->print(prefix+logstr, lvl);
- }
- }
-
- void Log::setPrefix(const std::string prefix) {
- if (!prefix.empty()){
- Log::prefix = "["+prefix+"]";
- } else {
- Log::prefix = "";
- }
- }
-
- void StdlogHandler::print(const std::string &str, Loglevel lvl) {
- std::string s = format_message_to_string(str, lvl);
- std::clog << s;
- }
-
- void FunctionalLogHandler::print(const std::string &str, Loglevel lvl) {
- std::string s = format_message_to_string(str, lvl);
- log_function(s);
- }
-
- std::string LogHandler::format_message_to_string(const std::string &str, const Loglevel &lvl) {
- static bool last_short = false;
- if (str.length() == 1){
- last_short = true;
- return str;
- }
- time_t t = time(nullptr);
- tm tm = *localtime(&t);
-
- std::stringstream s;
- s
- << (last_short? "\n" : "")
- << "[" << std::put_time(&tm, "%c") << "]"
- << "[" << loglevel_to_str(lvl) << "]\t"
- << str << std::endl;
- last_short = false;
- return s.str();
- }
-
- FunctionalLogHandler::FunctionalLogHandler(log_function_type _log_function) {
- log_function = _log_function;
- }
- }
-}