From 483c73630a82fe8fbe9fe74cc8bbdd23a13d8b6b Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 15 2月 2020 23:49:50 +0800
Subject: [PATCH] pc identifiers work
---
src/library/locate/ApplicationFolder.cpp | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index e8535d6..b13fedd 100644
--- a/src/library/locate/ApplicationFolder.cpp
+++ b/src/library/locate/ApplicationFolder.cpp
@@ -7,8 +7,10 @@
#include <fstream>
#include <sstream>
#include <string>
+#include <iostream>
#include <licensecc/datatypes.h>
+#include <licensecc_properties.h>
#include "../base/logger.h"
#include "../base/base.h"
@@ -16,27 +18,22 @@
#include "../base/FileUtils.hpp"
#include "../os/os.h"
#include "ApplicationFolder.hpp"
-#include <iostream>
namespace license {
namespace locate {
using namespace std;
-ApplicationFolder::ApplicationFolder() :
- LocatorStrategy("ApplicationFolder") {
-}
+ApplicationFolder::ApplicationFolder() : LocatorStrategy("ApplicationFolder") {}
-ApplicationFolder::~ApplicationFolder() {
-}
+ApplicationFolder::~ApplicationFolder() {}
-const vector<string> ApplicationFolder::license_locations(
- EventRegistry &eventRegistry) {
+const vector<string> ApplicationFolder::license_locations(EventRegistry &eventRegistry) {
vector<string> diskFiles;
- char fname[MAX_PATH] = { 0 };
+ char fname[MAX_PATH] = {0};
const FUNCTION_RETURN fret = getModuleName(fname);
if (fret == FUNC_RET_OK) {
const string module_name = remove_extension(fname);
- const string temptativeLicense = string(module_name) + ".lic";
+ const string temptativeLicense = string(module_name) + LCC_LICENSE_FILE_EXTENSION;
ifstream f(temptativeLicense.c_str());
if (f.good()) {
diskFiles.push_back(temptativeLicense);
@@ -51,5 +48,5 @@
return diskFiles;
}
-}
+} // namespace locate
} /* namespace license */
--
Gitblit v1.9.1