Merge follow-up changes.

xrootd · Oct 10, 2019 · 57a37ae · 57a37ae
1 parent 6d83442
commit 57a37ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/XrdFileCache/XrdFileCache.cc b/src/XrdFileCache/XrdFileCache.cc
@@ -702,7 +702,7 @@ int Cache::LocalFilePath(const char *curl, char *buff, int blen,
 
    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;
 
    if (why == ForPath)
    {
@@ -863,7 +863,7 @@ int Cache::Stat(const char *curl, struct stat &sbuff)
 {
    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;
 
    {
       XrdSysCondVarHelper lock(&m_active_cond);
@@ -963,7 +963,7 @@ int Cache::UnlinkCommon(const std::string& f_name, bool fail_if_open)
       RemoveWriteQEntriesFor(file);
    }
 
-   std::string i_name = f_name + Info::m_infoExtension;
+   std::string i_name = f_name + Info::s_infoExtension;
 
    // Unlink file & cinfo
    int f_ret = m_output_fs->Unlink(f_name.c_str());

diff --git a/src/XrdFileCache/XrdFileCacheFile.cc b/src/XrdFileCache/XrdFileCacheFile.cc
@@ -376,7 +376,7 @@ bool File::Open()
    XrdOucEnv   myEnv;
    struct stat data_stat, info_stat;
 
-   std::string ifn = m_filename + Info::m_infoExtension;
+   std::string ifn = m_filename + Info::s_infoExtension;
 
    bool data_existed = (myOss.Stat(m_filename.c_str(), &data_stat) == XrdOssOK);
    bool info_existed = (myOss.Stat(ifn.c_str(),        &info_stat) == XrdOssOK);
@@ -639,6 +639,7 @@ int File::Read(IO *io, char* iUserBuff, long long iUserOff, int iUserSize)
    const int idx_first = iUserOff / BS;
    const int idx_last  = (iUserOff + iUserSize - 1) / BS;
 
+   BlockSet_t  requested_blocks;
    BlockList_t blks_to_request, blks_to_process, blks_processed;
    IntList_t   blks_on_disk,    blks_direct;
 

diff --git a/src/XrdFileCache/XrdFileCachePurge.cc b/src/XrdFileCache/XrdFileCachePurge.cc
@@ -113,7 +113,7 @@ class DirState
       if (i != m_subdirs.end())  return & i->second;
 
       if (create_subdirs && m_depth < m_max_depth)  return create_child(dir);
-         
+
       return 0;
    }
 
@@ -526,7 +526,7 @@ void Cache::Purge()
    // { PathTokenizer p("/a/b/f.root", 2, true); p.deboog(); }
    // { PathTokenizer p("/a/f.root", 2, true); p.deboog(); }
    // { PathTokenizer p("/f.root", 2, true); p.deboog(); }
-   
+
    int  age_based_purge_countdown = 0; // enforce on first purge loop entry.
    bool is_first = true;