修改部分因为标准原因的报错

nancy.liao

2025-05-23 8553a8d63f97cfa8d64b5b2260e81f8c896a8398

 src/library/locate/EnvironmentVarLocation.cpp

@@ -5,52 +5,37 @@
 *      Author: Gabriele Contini
 */

#include <build_properties.h>
#include <licensecc_properties.h>

#include "../base/FileUtils.hpp"
#include "../base/StringUtils.h"
#include "../base/string_utils.h"
#include "EnvironmentVarLocation.hpp"
#include "../base/file_utils.hpp"

namespace license {
namespace locate {
using namespace std;

EnvironmentVarLocation::EnvironmentVarLocation() :
      LocatorStrategy("EnvironmentVarLocation") {
}
EnvironmentVarLocation::EnvironmentVarLocation() : LocatorStrategy("EnvironmentVarLocation") {}

EnvironmentVarLocation::~EnvironmentVarLocation() {
}
EnvironmentVarLocation::~EnvironmentVarLocation() {}

const vector<string> EnvironmentVarLocation::licenseLocations(
      EventRegistry &eventRegistry) const {
const vector<string> EnvironmentVarLocation::license_locations(EventRegistry &eventRegistry) {
   vector<string> licenseFileFoundWithEnvVariable;

   const string varName(LICENSE_LOCATION_ENV_VAR);
   const string varName(LCC_LICENSE_LOCATION_ENV_VAR);
   if (varName.length() > 0) {
      //var name is defined in header files.
      char *env_var_value = getenv(LICENSE_LOCATION_ENV_VAR);
      // var name is defined in header files.
      char *env_var_value = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
      if (env_var_value != nullptr && env_var_value[0] != '\0') {
         const vector<string> declared_positions = license::split_string(
               string(env_var_value), ';');
         vector<string> existing_pos = license::filter_existing_files(
               declared_positions);
         if (existing_pos.size() > 0) {
            for (auto it = existing_pos.begin(); it != existing_pos.end();
                  ++it) {
               licenseFileFoundWithEnvVariable.push_back(*it);
               eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, *it);
            }
         } else {
            eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
                  env_var_value);
         }
         const vector<string> declared_positions = license::split_string(string(env_var_value), ';');
         licenseFileFoundWithEnvVariable =
            license::filter_existing_files(declared_positions, eventRegistry, LCC_LICENSE_LOCATION_ENV_VAR);
      } else {
         eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, SVRT_WARN);
         eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED);
      }
   }
   return licenseFileFoundWithEnvVariable;
}

}
}
}  // namespace locate
}  // namespace license