From 5c0be6ec048f0d466c911e6362f1e9a883749cec Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 03 5月 2020 21:44:03 +0800
Subject: [PATCH] issue #77
---
src/library/LicenseReader.cpp | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 9aa53ab..47f006e 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -22,28 +22,26 @@
#include <stdlib.h>
#include <math.h>
-#include <public_key.h>
-#include <licensecc_properties.h>
#include <licensecc/licensecc.h>
#include "base/base.h"
-#include "pc-identifiers.h"
#include "LicenseReader.hpp"
-#include "base/StringUtils.h"
+#include "base/string_utils.h"
#include "base/logger.h"
#include "locate/LocatorFactory.hpp"
namespace license {
+using namespace std;
FullLicenseInfo::FullLicenseInfo(const string &source, const string &product, const string &license_signature)
: source(source),
m_project(product), //
- license_signature(license_signature) {}
+ license_signature(license_signature),
+ m_magic(0) {}
LicenseReader::LicenseReader(const LicenseLocation *licenseLocation) : licenseLocation(licenseLocation) {}
-EventRegistry LicenseReader::readLicenses(const string &product, vector<FullLicenseInfo> &licenseInfoOut) {
- vector<string> diskFiles;
+EventRegistry LicenseReader::readLicenses(const string &product, vector<FullLicenseInfo> &licenseInfoOut) const {
vector<unique_ptr<locate::LocatorStrategy>> locator_strategies;
FUNCTION_RETURN ret = locate::LocatorFactory::get_active_strategies(locator_strategies, licenseLocation);
EventRegistry eventRegistry;
@@ -64,7 +62,7 @@
CSimpleIniA ini;
for (auto it = licenseLocations.begin(); it != licenseLocations.end(); it++) {
ini.Reset();
- string license = locator->retrieve_license_content((*it).c_str());
+ const string license = locator->retrieve_license_content((*it).c_str());
const SI_Error rc = ini.LoadData(license.c_str(), license.size());
if (rc < 0) {
eventRegistry.addEvent(FILE_FORMAT_NOT_RECOGNIZED, *it);
@@ -114,13 +112,13 @@
ostringstream oss;
oss << toupper_copy(trim_copy(m_project));
for (auto &it : m_limits) {
- if (it.first != LICENSE_VERSION && it.first != LICENSE_SIGNATURE) {
+ if (it.first != LICENSE_SIGNATURE) {
oss << trim_copy(it.first) << trim_copy(it.second);
}
}
#ifdef _DEBUG
- cout << "[" << oss.str() << "]" << endl;
+ cout << "license to sign [" << oss.str() << "]" << endl;
#endif
return oss.str();
}
--
Gitblit v1.9.1