From dabc496a2b86869b3e559a87efdd74af108a31f5 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 23 11月 2019 22:48:18 +0800
Subject: [PATCH] signature verified, tests
---
src/library/locate/ApplicationFolder.cpp | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index 9ba99ee..e8535d6 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,18 +22,15 @@
namespace locate {
using namespace std;
-
-
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 };
const FUNCTION_RETURN fret = getModuleName(fname);
@@ -44,11 +40,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 {
--
Gitblit v1.9.1