rename enums and further developments

Gabriele Contini

2020-01-11 1d1082fe695366da3498f528b953203a90fe7385

 src/library/locate/EnvironmentVarData.cpp

@@ -29,24 +29,24 @@

const vector<string> EnvironmentVarData::license_locations(EventRegistry &eventRegistry) {
   vector<string> diskFiles;
   char *env_var_value = getenv(LICENSE_DATA_ENV_VAR);
   char *env_var_value = getenv(LCC_LICENSE_DATA_ENV_VAR);
   if (env_var_value != nullptr && env_var_value[0] != '\0') {
      eventRegistry.addEvent(LICENSE_SPECIFIED, LICENSE_LOCATION_ENV_VAR);
      eventRegistry.addEvent(LICENSE_SPECIFIED, LCC_LICENSE_LOCATION_ENV_VAR);
      FILE_FORMAT licenseFormat = identify_format(env_var_value);
      if (licenseFormat == UNKNOWN) {
         eventRegistry.addEvent(LICENSE_MALFORMED, LICENSE_LOCATION_ENV_VAR);
         eventRegistry.addEvent(LICENSE_MALFORMED, LCC_LICENSE_LOCATION_ENV_VAR);
      } else {
         diskFiles.push_back(LICENSE_LOCATION_ENV_VAR);
         diskFiles.push_back(LCC_LICENSE_LOCATION_ENV_VAR);
         isBase64 = (licenseFormat == BASE64);
      }
   } else {
      eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, LICENSE_LOCATION_ENV_VAR);
      eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, LCC_LICENSE_LOCATION_ENV_VAR);
   }
   return diskFiles;
}

const std::string EnvironmentVarData::retrieve_license_content(const std::string &licenseLocation) const {
   string tmpVal = getenv(LICENSE_LOCATION_ENV_VAR);
   string tmpVal = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
   if (isBase64) {
      int flen = 0;
      unsigned char *raw = unbase64(tmpVal.c_str(), tmpVal.length(), &flen);