From 82f9d834ad772b2f16b6524f679d14d8a7afe881 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: 周二, 10 9月 2019 23:29:10 +0800
Subject: [PATCH] fix issue #37 tests in windows
---
src/tools/license-generator/license-generator.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/tools/license-generator/license-generator.cpp b/src/tools/license-generator/license-generator.cpp
index bbf8b0f..a2b70e5 100644
--- a/src/tools/license-generator/license-generator.cpp
+++ b/src/tools/license-generator/license-generator.cpp
@@ -84,7 +84,7 @@
try {
end_date = normalize_date(dt_end);
char curdate[20];
- time_t curtime = time(NULL);
+ time_t curtime = time(nullptr);
strftime(curdate, 20, "%Y-%m-%d", localtime(&curtime));
begin_date.assign(curdate);
} catch (const invalid_argument &e) {
@@ -107,7 +107,9 @@
string client_signature = "";
if (vm.count("client_signature")) {
client_signature = vm["client_signature"].as<string>();
+ cout << "cli sig:" << client_signature;
regex e("[A-Za-z0-9\\+/]{4}-[A-Za-z0-9\\+/]{4}-[A-Za-z0-9\\+/]{4}-[A-Za-z0-9\\+/]{4}");
+ cout << "\nregex:";
if (!regex_match(client_signature, e)) {
cerr << endl << "Client signature not recognized: "
<< client_signature
@@ -143,12 +145,12 @@
void LicenseGenerator::generateAndOutputLicenses(const po::variables_map& vm,
ostream& outputFile) {
vector<FullLicenseInfo> licenseInfo = parseLicenseInfo(vm);
- unique_ptr<CryptoHelper> helper = CryptoHelper::getInstance();
+ const unique_ptr<CryptoHelper> helper = CryptoHelper::getInstance();
const char pkey[] = PRIVATE_KEY;
- size_t len = sizeof(pkey);
+ const size_t len = sizeof(pkey);
for (auto it = licenseInfo.begin(); it != licenseInfo.end(); ++it) {
const string license = it->printForSign();
- string signature = helper->signString((const void *)pkey,len,license);
+ const string signature = helper->signString((const void *)pkey,len,license);
it->license_signature = signature;
it->printAsIni(outputFile);
}
--
Gitblit v1.9.1