From e22505aee5a36e2290c32ccec12d50ec4e7fde27 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 18:48:45 +0800
Subject: [PATCH] fix centos tests
---
src/library/locate/ApplicationFolder.cpp | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index 9ba99ee..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,20 +22,13 @@
namespace locate {
using namespace std;
+ApplicationFolder::ApplicationFolder() : LocatorStrategy("ApplicationFolder") {}
+ApplicationFolder::~ApplicationFolder() {}
-ApplicationFolder::ApplicationFolder() :
- LocatorStrategy("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);
if (fret == FUNC_RET_OK) {
const string module_name = remove_extension(fname);
@@ -44,11 +36,9 @@
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 {
@@ -57,5 +47,5 @@
return diskFiles;
}
-}
+} // namespace locate
} /* namespace license */
--
Gitblit v1.9.1