From 913b583d4c0e04610c7c6a7277dc8bcb3c96ec60 Mon Sep 17 00:00:00 2001 From: Matevz Tadel Date: Thu, 10 Oct 2019 13:46:55 -0700 Subject: [PATCH] Fix XCache compilation errors. --- src/XrdFileCache/XrdFileCache.cc | 3 ++- src/XrdFileCache/XrdFileCacheConfiguration.cc | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/XrdFileCache/XrdFileCache.cc b/src/XrdFileCache/XrdFileCache.cc index 425764cb980..5d2a591015d 100644 --- a/src/XrdFileCache/XrdFileCache.cc +++ b/src/XrdFileCache/XrdFileCache.cc @@ -577,6 +577,7 @@ void Cache::dec_ref_cnt(File* f, bool high_debug) } delete f; + } } } @@ -807,7 +808,7 @@ int Cache::Prepare(const char *curl, int oflags, mode_t mode) { XrdCl::URL url(curl); std::string f_name = url.GetPath(); - std::string i_name = f_name + Info::m_infoExtension; + std::string i_name = f_name + Info::s_infoExtension; // Do not allow write access. if (oflags & (O_WRONLY | O_RDWR)) diff --git a/src/XrdFileCache/XrdFileCacheConfiguration.cc b/src/XrdFileCache/XrdFileCacheConfiguration.cc index 39af92b243c..8dfda907cad 100644 --- a/src/XrdFileCache/XrdFileCacheConfiguration.cc +++ b/src/XrdFileCache/XrdFileCacheConfiguration.cc @@ -244,7 +244,9 @@ bool Cache::Config(const char *config_filename, const char *parameters) } if (sP.Total < 10ll << 20) { - m_log.Emsg("Cache::ConfigParameters()", "available data space is less than 10 MB (can be due to a mistake in oss.localroot directive) for space ", m_configuration.m_d return false; + m_log.Emsg("Cache::ConfigParameters()", "available data space is less than 10 MB (can be due to a mistake in oss.localroot directive) for space ", + m_configuration.m_data_space.c_str()); + return false; } m_configuration.m_diskTotalSpace = sP.Total;