From baa4e86bae8bb6a2884d74b21dc374e68dad8bbd Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 05 12月 2020 23:37:23 +0800
Subject: [PATCH] minor changes
---
src/library/licensecc.cpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index 087d7cf..2642811 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
+#ifndef NDEBUG
cout << "Error occurred: " << 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,8 +78,8 @@
string project;
size_t str_size;
if (callerInformation != nullptr &&
- (str_size = license::mstrnlen_s(callerInformation->project_name, sizeof callerInformation->project_name)) > 0) {
- project = string(callerInformation->project_name, str_size);
+ (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,7 +123,7 @@
license_out->days_left = 0;
}
}
-#ifdef _DEBUG
+#ifndef NDEBUG
cout << er << endl;
#endif
--
Gitblit v1.9.1