From c536a979f5a213188ac54f5669ddf4b4ff48c218 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 07 9月 2019 22:13:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
src/library/license++.cpp | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/library/license++.cpp b/src/library/license++.cpp
index f0b20d0..f9cc7c7 100644
--- a/src/library/license++.cpp
+++ b/src/library/license++.cpp
@@ -10,37 +10,36 @@
#include <stdlib.h>
#include <cstring>
#include "api/license++.h"
-#include "reader/LicenseReader.h"
+#include "LicenseReader.h"
using namespace std;
-DllExport void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {
+void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {
}
-DllExport void identify_pc(IDENTIFICATION_STRATEGY pc_id_method,
- char chbuffer[PC_IDENTIFIER_SIZE + 1]) {
+void identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char chbuffer[PC_IDENTIFIER_SIZE + 1]) {
}
static void mergeLicenses(vector<license::FullLicenseInfo> licenses,
LicenseInfo* license) {
- if (license != NULL) {
+ if (license != nullptr) {
time_t curLicense_exp = 0;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
//choose the license that expires later...
if (!it->has_expiry) {
it->toLicenseInfo(license);
break;
- } else if (curLicense_exp < it->to_date) {
- curLicense_exp = it->to_date;
+ } else if (curLicense_exp < it->expires_on()) {
+ curLicense_exp = it->expires_on();
it->toLicenseInfo(license);
}
}
}
}
-EVENT_TYPE acquire_license(char * product, LicenseLocation licenseLocation,
- LicenseInfo* license) {
+EVENT_TYPE acquire_license(const char * product,
+ LicenseLocation licenseLocation, LicenseInfo* license) {
license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
license::EventRegistry er = lr.readLicenses(string(product), licenses);
@@ -50,7 +49,7 @@
vector<license::FullLicenseInfo> licenses_ok;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
license::EventRegistry validation_er = it->validate(0);
- if (er.isGood()) {
+ if (validation_er.isGood()) {
licenses_ok.push_back(*it);
} else {
licenses_with_errors.push_back(*it);
@@ -69,18 +68,18 @@
} else {
result = er.getLastFailure()->event_type;
}
- if (license != NULL) {
+ if (license != nullptr) {
er.exportLastEvents(license->status, 5);
}
return result;
}
-DllExport enum EVENT_TYPE confirm_license(char * product,
+EVENT_TYPE confirm_license(char * product,
LicenseLocation licenseLocation) {
return LICENSE_OK;
}
-DllExport enum EVENT_TYPE release_license(char * product,
+EVENT_TYPE release_license(char * product,
LicenseLocation licenseLocation) {
return LICENSE_OK;
}
--
Gitblit v1.9.1