From 84597288d950867922a185b2c5a8231495a5d303 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 11 1月 2020 15:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers
---
src/library/licensecc.cpp | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index 27f3ac7..9b5f5ca 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -1,5 +1,5 @@
//============================================================================
-// Name : license-manager-cpp.cpp
+// Name : licensecc.cpp
// Author :
// Version :
// Copyright : BSD
@@ -17,22 +17,21 @@
#include <licensecc/licensecc.h>
#include <licensecc_properties.h>
+#include "pc_identifier/pc_identifier_facade.hpp"
#include "limits/license_verifier.hpp"
#include "base/StringUtils.h"
#include "LicenseReader.hpp"
-#include "pc-identifiers.h"
using namespace std;
-void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
+
+void print_error(char out_buffer[API_ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
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);
+ string pc_id = license::PcIdentifierFacade::generate_user_pc_signature(pc_id_method);
+ if (*bufSize >= pc_id.size() + 1) {
+ strncpy(chbuffer, pc_id.c_str(), *bufSize);
} else {
- *bufSize = sizeof(PcSignature);
+ *bufSize = pc_id.size() + 1;
}
return result == FUNC_RET_OK;
}
@@ -110,7 +109,7 @@
#endif
if (license_out != nullptr) {
- er.exportLastEvents(license_out->status, AUDIT_EVENT_NUM);
+ er.exportLastEvents(license_out->status, API_AUDIT_EVENT_NUM);
}
return result;
}
--
Gitblit v1.9.1