From bd25f8043a261f59083d869f33ac0ecbd67cf02f Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周二, 12 11月 2019 10:24:46 +0800
Subject: [PATCH] fix submodules
---
src/library/license++.cpp | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/library/license++.cpp b/src/library/license++.cpp
index fd07af8..b702d51 100644
--- a/src/library/license++.cpp
+++ b/src/library/license++.cpp
@@ -1,6 +1,6 @@
//============================================================================
// Name : license-manager-cpp.cpp
-// Author :
+// Author :
// Version :
// Copyright : BSD
//============================================================================
@@ -9,8 +9,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <cstring>
+#include <iostream>
+
#include "api/license++.h"
-#include "LicenseReader.h"
+
+#include "LicenseReader.hpp"
using namespace std;
void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {
@@ -23,7 +26,7 @@
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...
@@ -39,7 +42,7 @@
}
EVENT_TYPE acquire_license(const char * product,
- LicenseLocation licenseLocation, LicenseInfo* license) {
+ const LicenseLocation* licenseLocation, LicenseInfo* licenseInfoOut) {
license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
license::EventRegistry er = lr.readLicenses(string(product), licenses);
@@ -48,28 +51,32 @@
vector<license::FullLicenseInfo> licenses_with_errors;
vector<license::FullLicenseInfo> licenses_ok;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
- license::EventRegistry validation_er = it->validate(0);
- if (validation_er.isGood()) {
+ bool valid = it->validate(0,er);
+ if (valid) {
licenses_ok.push_back(*it);
} else {
licenses_with_errors.push_back(*it);
}
- er.append(validation_er);
}
if (licenses_ok.size() > 0) {
- er.turnErrosIntoWarnings();
+ er.turnErrorsIntoWarnings();
result = LICENSE_OK;
- mergeLicenses(licenses_ok, license);
+ mergeLicenses(licenses_ok, licenseInfoOut);
} else {
+ er.turnWarningsIntoErrors();
result = er.getLastFailure()->event_type;
- mergeLicenses(licenses_with_errors, license);
+ mergeLicenses(licenses_with_errors, licenseInfoOut);
}
} else {
+ er.turnWarningsIntoErrors();
result = er.getLastFailure()->event_type;
}
- if (license != NULL) {
- er.exportLastEvents(license->status, 5);
+#ifdef _DEBUG
+ cout << er <<endl;
+#endif
+ if (licenseInfoOut != nullptr) {
+ er.exportLastEvents(licenseInfoOut->status, AUDIT_EVENT_NUM);
}
return result;
}
--
Gitblit v1.9.1