From 66e8c7601d2c52626e4ff39f2559cff3271eb770 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 12月 2019 15:34:38 +0800
Subject: [PATCH] centos 7 update cmake
---
src/library/locate/ApplicationFolder.cpp | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index cd25815..215d477 100644
--- a/src/library/locate/ApplicationFolder.cpp
+++ b/src/library/locate/ApplicationFolder.cpp
@@ -8,10 +8,9 @@
#include <sstream>
#include <string>
-#include <build_properties.h>
+#include <licensecc/datatypes.h>
#include "../base/logger.h"
-#include "../api/datatypes.h"
#include "../base/base.h"
#include "../base/EventRegistry.h"
#include "../base/FileUtils.hpp"
@@ -23,31 +22,23 @@
namespace locate {
using namespace std;
-ApplicationFolder::ApplicationFolder() :
- LocatorStrategy("ApplicationFolder") {
+ApplicationFolder::ApplicationFolder() : LocatorStrategy("ApplicationFolder") {}
-}
+ApplicationFolder::~ApplicationFolder() {}
-ApplicationFolder::~ApplicationFolder() {
-}
-
-const vector<string> ApplicationFolder::licenseLocations(
- EventRegistry &eventRegistry) const {
+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);
- cout << string(fname) << endl;
- cout << fret << endl;
if (fret == FUNC_RET_OK) {
- const string temptativeLicense = string(fname) + ".lic";
+ const string module_name = remove_extension(fname);
+ const string temptativeLicense = string(module_name) + ".lic";
ifstream f(temptativeLicense.c_str());
if (f.good()) {
diskFiles.push_back(temptativeLicense);
- eventRegistry.addEvent((EVENT_TYPE) LICENSE_FILE_FOUND,
- (SEVERITY) SVRT_INFO, temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FOUND, temptativeLicense.c_str());
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, temptativeLicense.c_str());
}
f.close();
} else {
@@ -56,5 +47,5 @@
return diskFiles;
}
-}
+} // namespace locate
} /* namespace license */
--
Gitblit v1.9.1