From e3e83c70085d9a9c82b643b46d918fe3a2d21e03 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 12月 2019 11:35:52 +0800
Subject: [PATCH] fix windows compilation, better cmake output
---
src/library/licensecc.cpp | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index fe1b3a7..8860311 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -13,24 +13,34 @@
#include <licensecc/datatypes.h>
#include <licensecc/licensecc.h>
+#include <licensecc_properties.h>
#include "limits/license_verifier.hpp"
#include "LicenseReader.hpp"
+#include "pc-identifiers.h"
using namespace std;
void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
-void identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char chbuffer[PC_IDENTIFIER_SIZE + 1]) {}
+bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t bufSize) {
+ FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
+ if (bufSize >= sizeof(PcSignature)) {
+ PcSignature identifier_out;
+ result = generate_user_pc_signature(identifier_out, pc_id_method);
+ strncpy(chbuffer, identifier_out, bufSize);
+ }
+ return result == FUNC_RET_OK;
+}
static void mergeLicenses(const vector<LicenseInfo>& licenses, LicenseInfo* license_out) {
if (license_out != nullptr) {
- int days_left = -1;
+ int days_left = INT_MIN;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
// choose the license that expires later...
if (!it->has_expiry) {
*license_out = *it;
break;
- } else if (days_left < it->days_left) {
+ } else if (days_left < (int)it->days_left) {
*license_out = *it;
days_left = it->days_left;
}
@@ -40,7 +50,7 @@
EVENT_TYPE acquire_license(const CallerInformations* callerInformation, const LicenseLocation* licenseLocation,
LicenseInfo* license_out) {
- license::LicenseReader lr = license::LicenseReader(licenseLocation);
+ const license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
string project;
if (callerInformation != nullptr && strlen(callerInformation->project_name) > 0) {
--
Gitblit v1.9.1