From 74001fb4ce5041c3deb42a0ca252ae338aa571db Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 07 12月 2019 18:13:59 +0800
Subject: [PATCH] modified cmake scripts for easy export and import
---
src/library/locate/EnvironmentVarData.cpp | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/library/locate/EnvironmentVarData.cpp b/src/library/locate/EnvironmentVarData.cpp
index 616b948..6e47d21 100644
--- a/src/library/locate/EnvironmentVarData.cpp
+++ b/src/library/locate/EnvironmentVarData.cpp
@@ -6,14 +6,14 @@
*/
#include "EnvironmentVarData.hpp"
+#include <licensecc/datatypes.h>
-#include <build_properties.h>
+#include <licensecc_properties.h>
#include <cstdlib>
#include <regex>
#include <string>
#include <vector>
-#include "../api/datatypes.h"
#include "../base/base64.h"
#include "../base/EventRegistry.h"
#include "../base/StringUtils.h"
@@ -23,15 +23,11 @@
using namespace std;
-EnvironmentVarData::EnvironmentVarData() :
- LocatorStrategy("EnvironmentVarData") {
-}
+EnvironmentVarData::EnvironmentVarData() : LocatorStrategy("EnvironmentVarData") {}
-EnvironmentVarData::~EnvironmentVarData() {
-}
+EnvironmentVarData::~EnvironmentVarData() {}
-const vector<string> EnvironmentVarData::license_locations(
- EventRegistry &eventRegistry) {
+const vector<string> EnvironmentVarData::license_locations(EventRegistry &eventRegistry) {
vector<string> diskFiles;
char *env_var_value = getenv(LICENSE_DATA_ENV_VAR);
if (env_var_value != nullptr && env_var_value[0] != '\0') {
@@ -44,24 +40,22 @@
isBase64 = (licenseFormat == BASE64);
}
} else {
- eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
- LICENSE_LOCATION_ENV_VAR);
+ eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, LICENSE_LOCATION_ENV_VAR);
}
return diskFiles;
}
-const std::string EnvironmentVarData::retrieve_license_content(
- const std::string &licenseLocation) const {
+const std::string EnvironmentVarData::retrieve_license_content(const std::string &licenseLocation) const {
string tmpVal = getenv(LICENSE_LOCATION_ENV_VAR);
if (isBase64) {
int flen = 0;
unsigned char *raw = unbase64(tmpVal.c_str(), tmpVal.length(), &flen);
- string str = string(reinterpret_cast<char*>(raw));
+ string str = string(reinterpret_cast<char *>(raw));
free(raw);
return str;
}
return tmpVal;
}
-}
-}
+} // namespace locate
+} // namespace license
--
Gitblit v1.9.1