Minor fixes from code review

Author: bbockelm

src/GlobusDirectory.cc

@@ -54,8 +54,8 @@ void GlobusDirectory::Reset() {
 int GlobusDirectory::ListGlobusDir() {
 	m_log.Log(XrdHTTPServer::Debug, "GlobusDirectory::ListGlobusDir",
 			  "Listing directory:", m_object.c_str());
-	HTTPDownload listCommand(m_fs->getLsUrl(), m_object, m_log,
-							 m_fs->getTransferToken());
+	HTTPDownload listCommand(m_fs.getLsUrl(), m_object, m_log,
+							 m_fs.getTransferToken());
 
 	if (!listCommand.SendRequest(0, 0)) {
 		return HTTPRequest::HandleHTTPError(
@@ -118,7 +118,7 @@ int GlobusDirectory::Opendir(const char *path, XrdOucEnv &env) {
 		realPath = realPath + "/";
 	}
 
-	std::string storagePrefix = m_fs->getStoragePrefix();
+	std::string storagePrefix = m_fs.getStoragePrefix();
 	std::string object;
 
 	if (realPath.find(storagePrefix) == 0) {
@@ -257,4 +257,4 @@ int GlobusDirectory::Close(long long *retsz) {
 	}
 	Reset();
 	return XrdOssOK;
-}
+}

src/GlobusDirectory.hh

@@ -33,7 +33,7 @@ struct GlobusObjectInfo {
 
 class GlobusDirectory : public HTTPDirectory {
   public:
-	GlobusDirectory(XrdSysError &log, const GlobusFileSystem *fs)
+	GlobusDirectory(XrdSysError &log, const GlobusFileSystem &fs)
 		: HTTPDirectory(log), m_fs(fs) {}
 
 	virtual ~GlobusDirectory() {}
@@ -56,6 +56,6 @@ class GlobusDirectory : public HTTPDirectory {
 	std::vector<GlobusObjectInfo> m_directories;
 	std::string m_prefix;
 	std::string m_object;
-	const GlobusFileSystem *m_fs;
+	const GlobusFileSystem &m_fs;
 	struct stat *m_stat_buf{nullptr};
-};
+};

src/GlobusFile.cc

@@ -39,7 +39,9 @@
 extern "C" {
 
 /*
-	This function is called when we are wrapping something.
+	The GlobusFileSystem adds Globus-specific functionality on top of the
+	HTTPFileSystem.  Rather than re-implement or re-compile things, for now,
+	we simply assume we wrap on top.
 */
 XrdOss *XrdOssAddStorageSystem2(XrdOss *curr_oss, XrdSysLogger *logger,
 								const char *config_fn, const char *parms,
@@ -58,4 +60,4 @@ XrdOss *XrdOssAddStorageSystem2(XrdOss *curr_oss, XrdSysLogger *logger,
 
 } // end extern "C"
 
-XrdVERSIONINFO(XrdOssAddStorageSystem2, globus);
+XrdVERSIONINFO(XrdOssAddStorageSystem2, globus);

src/GlobusFile.hh

@@ -23,8 +23,7 @@
 
 class GlobusFile final : public XrdOssWrapDF {
   public:
-	GlobusFile(std::unique_ptr<XrdOssDF> wrapped, XrdSysError &log,
-			   GlobusFileSystem *fs)
+	GlobusFile(std::unique_ptr<XrdOssDF> wrapped, XrdSysError &log)
 		: XrdOssWrapDF(*wrapped), m_wrapped(std::move(wrapped)) {}
 
 	virtual ~GlobusFile() {}

src/GlobusFileSystem.cc

@@ -137,12 +137,12 @@ bool GlobusFileSystem::Config(XrdSysLogger *lp, const char *configfn) {
 }
 
 XrdOssDF *GlobusFileSystem::newDir(const char *user) {
-	return new GlobusDirectory(m_log, this);
+	return new GlobusDirectory(m_log, *this);
 }
 
 XrdOssDF *GlobusFileSystem::newFile(const char *user) {
 	std::unique_ptr<XrdOssDF> wrapped(wrapPI.newFile(user));
-	return new GlobusFile(std::move(wrapped), m_log, this);
+	return new GlobusFile(std::move(wrapped), m_log);
 }
 
 int GlobusFileSystem::Stat(const char *path, struct stat *buff, int opts,

src/HTTPCommands.cc

@@ -145,7 +145,7 @@ bool HTTPRequest::SendHTTPRequest(const std::string &payload) {
 	m_log.Log(LogMask::Debug, "HTTPRequest::SendHTTPRequest",
 			  "Sending request");
 
-	return sendPreparedRequest(hostUrl, payload, payload.size(), final);
+	return sendPreparedRequest(hostUrl, payload, payload.size(), true);
 }
 
 static void dump(XrdSysError *log, const char *text, unsigned char *ptr,

src/HTTPCommands.hh

@@ -96,18 +96,21 @@ class HTTPRequest {
 		return m_timeout_duration;
 	}
 
-	// Handle HTTP request errors and convert them to appropriate POSIX error codes.
-	// This function can be used anywhere HTTP requests are made to provide
-	// consistent error handling.
+	// Handle HTTP request errors and convert them to appropriate POSIX error
+	// codes. This function can be used anywhere HTTP requests are made to
+	// provide consistent error handling.
 	//
 	// - request: The HTTPRequest object that was used for the request
 	// - log: The logger instance for error reporting
-	// - operation: A string describing the operation being performed (for logging)
+	// - operation: A string describing the operation being performed (for
+	// logging)
 	// - context: Additional context information (for logging)
 	//
-	// Returns: A POSIX error code (-ENOENT, -EIO, -EPERM, etc.) or 0 if no error
+	// Returns: A POSIX error code (-ENOENT, -EIO, -EPERM, etc.) or 0 if no
+	// error
 	static int HandleHTTPError(const HTTPRequest &request, XrdSysError &log,
-							   const char *operation, const char *context = nullptr);
+							   const char *operation,
+							   const char *context = nullptr);
 
   protected:
 	// Send the request to the HTTP server.
@@ -299,7 +302,7 @@ class HTTPRequest {
 	static std::chrono::steady_clock::duration m_timeout_duration;
 };
 
-class HTTPUpload : public HTTPRequest {
+class HTTPUpload final : public HTTPRequest {
   public:
 	HTTPUpload(const std::string &h, const std::string &o, XrdSysError &log,
 			   const TokenFile *token)
@@ -332,7 +335,7 @@ class HTTPUpload : public HTTPRequest {
 	std::string path;
 };
 
-class HTTPDownload : public HTTPRequest {
+class HTTPDownload final : public HTTPRequest {
   public:
 	HTTPDownload(const std::string &h, const std::string &o, XrdSysError &log,
 				 const TokenFile *token)
@@ -348,7 +351,7 @@ class HTTPDownload : public HTTPRequest {
 	std::string object;
 };
 
-class HTTPHead : public HTTPRequest {
+class HTTPHead final : public HTTPRequest {
   public:
 	HTTPHead(const std::string &h, const std::string &o, XrdSysError &log,
 			 const TokenFile *token)
@@ -364,10 +367,10 @@ class HTTPHead : public HTTPRequest {
 	std::string object;
 };
 
-class HTTPDelete : public HTTPRequest {
+class HTTPDelete final : public HTTPRequest {
   public:
 	HTTPDelete(const std::string &h, const std::string &o, XrdSysError &log,
-			 const TokenFile *token)
+			   const TokenFile *token)
 		: HTTPRequest(h, log, token), object(o) {
 		hostUrl = hostUrl + "/" + object;
 	}
@@ -378,4 +381,4 @@ class HTTPDelete : public HTTPRequest {
 
   protected:
 	std::string object;
-};
+};