From 907a46213e5ca3e741744f67ad71966b70b89e38 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 05 12月 2020 23:38:40 +0800
Subject: [PATCH] fix Codacy warnings
---
src/library/licensecc.cpp | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index 0573121..af9b171 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -18,6 +18,7 @@
#include <licensecc_properties.h>
#include "base/logger.h"
+#include "base/string_utils.h"
#include "hw_identifier/hw_identifier_facade.hpp"
#include "os/execution_environment.hpp"
#include "limits/license_verifier.hpp"
@@ -34,19 +35,19 @@
if (*bufSize > LCC_API_PC_IDENTIFIER_SIZE && chbuffer != nullptr) {
try {
const string pc_id = license::hw_identifier::HwIdentifierFacade::generate_user_pc_signature(pc_id_method);
- strncpy(chbuffer, pc_id.c_str(), *bufSize);
+ license::mstrlcpy(chbuffer, pc_id.c_str(), *bufSize);
result = true;
} catch (const std::exception& ex) {
LOG_ERROR("Error calculating hw_identifier: %s", ex.what());
-#ifdef _DEBUG
- cout << "Error occurred: " << ex.what() << std::endl;
+#ifndef NDEBUG
+ cerr << "Error occurred in identify_pc: " << ex.what() << std::endl;
#endif
}
} else {
*bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
}
+ static const license::os::ExecutionEnvironment exec_env;
if (execution_environment_info != nullptr) {
- const license::os::ExecutionEnvironment exec_env;
execution_environment_info->cloud_provider = exec_env.cloud_provider();
execution_environment_info->virtualization = exec_env.virtualization();
execution_environment_info->virtualization_detail = exec_env.virtualization_detail();
@@ -77,7 +78,7 @@
string project;
size_t str_size;
if (callerInformation != nullptr &&
- (str_size = license::mstrnlen_s(callerInformation->feature_name, sizeof callerInformation->project_name)) > 0) {
+ (str_size = license::mstrnlen_s(callerInformation->feature_name, sizeof callerInformation->feature_name)) > 0) {
project = string(callerInformation->feature_name, str_size);
} else {
project = string(LCC_PROJECT_NAME);
@@ -122,8 +123,9 @@
license_out->days_left = 0;
}
}
-#ifdef _DEBUG
- cout << er << endl;
+#ifndef NDEBUG
+ const string evlog = er.to_string();
+ LOG_DEBUG("License status %s", evlog.c_str());
#endif
if (license_out != nullptr) {
--
Gitblit v1.9.1