Fixup compiler and precommit warnings on OS X

Author: bbockelm

CMakeLists.txt

@@ -57,6 +57,7 @@ if(NOT nlohmann_json_FOUND)
   FetchContent_Declare(
     nlohmann_json
     URL "${JSON_URL}"
+    URL_HASH SHA256=8c4b26bf4b422252e13f332bc5e388ec0ab5c3443d24399acb675e68278d341f
   )
   FetchContent_MakeAvailable(nlohmann_json)
 endif()

src/GlobusFile.hh

@@ -21,33 +21,27 @@
 #include "GlobusFileSystem.hh"
 #include <XrdOss/XrdOssWrapper.hh>
 
-class GlobusFile : public XrdOssWrapDF {
+class GlobusFile final : public XrdOssWrapDF {
   public:
 	GlobusFile(std::unique_ptr<XrdOssDF> wrapped, XrdSysError &log,
 			   GlobusFileSystem *fs)
-		: XrdOssWrapDF(*wrapped), m_wrapped(std::move(wrapped)), m_log(log),
-		  m_oss(*fs) {}
+		: XrdOssWrapDF(*wrapped), m_wrapped(std::move(wrapped)) {}
 
 	virtual ~GlobusFile() {}
 
-    int Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) override {
-        return m_wrapped->Open(path, Oflag, Mode, env);
-    }
-    int Fstat(struct stat *buf) override {
-        return m_wrapped->Fstat(buf);
-    }
-    ssize_t Read(void *buffer, off_t offset, size_t size) override {
-        return m_wrapped->Read(buffer, offset, size);
-    }
-    ssize_t Write(const void *buffer, off_t offset, size_t size) override {
-        return m_wrapped->Write(buffer, offset, size);
-    }
-    int Close(long long *retsz = 0) override {
-        return m_wrapped->Close(retsz);
-    }
+	int Open(const char *path, int Oflag, mode_t Mode,
+			 XrdOucEnv &env) override {
+		return m_wrapped->Open(path, Oflag, Mode, env);
+	}
+	int Fstat(struct stat *buf) override { return m_wrapped->Fstat(buf); }
+	ssize_t Read(void *buffer, off_t offset, size_t size) override {
+		return m_wrapped->Read(buffer, offset, size);
+	}
+	ssize_t Write(const void *buffer, off_t offset, size_t size) override {
+		return m_wrapped->Write(buffer, offset, size);
+	}
+	int Close(long long *retsz = 0) override { return m_wrapped->Close(retsz); }
 
   private:
 	std::unique_ptr<XrdOssDF> m_wrapped;
-	XrdSysError &m_log;
-	GlobusFileSystem &m_oss;
-};
+};

src/GlobusFileSystem.cc

@@ -46,7 +46,7 @@ using namespace XrdHTTPServer;
 
 GlobusFileSystem::GlobusFileSystem(XrdOss *oss, XrdSysLogger *lp,
 								   const char *configfn, XrdOucEnv *envP)
-	: XrdOssWrapper(*oss), m_oss(oss), m_env(envP), m_log(lp, "globus_"),
+	: XrdOssWrapper(*oss), m_oss(oss), m_log(lp, "globus_"),
 	  m_transfer_token("", nullptr) {
 	m_log.Say("------ Initializing the Globus filesystem plugin.");
 

src/GlobusFileSystem.hh

@@ -101,11 +101,10 @@ class GlobusFileSystem : public XrdOssWrapper {
 	std::string extractRelativePath(const std::string &path) const;
 
 	std::unique_ptr<XrdOss> m_oss;
-	XrdOucEnv *m_env;
 	XrdSysError m_log;
 
 	// Globus-specific configuration
 	std::string m_transfer_url;
 	std::string m_storage_prefix;
 	TokenFile m_transfer_token;
-};
+};