signature verified, tests

gcontini

2019-11-23 f5106362b82b035dcd8e487d755316e886de3440

 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 {