Cleanup warnings on Mac OS X

PelicanPlatform · Jan 4, 2025 · 67fbc28 · 67fbc28
1 parent 6be7397
commit 67fbc28
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/src/HTTPFileSystem.cc b/src/HTTPFileSystem.cc
@@ -41,8 +41,8 @@
 using namespace XrdHTTPServer;
 
 HTTPFileSystem::HTTPFileSystem(XrdSysLogger *lp, const char *configfn,
-							   XrdOucEnv *envP)
-	: m_env(envP), m_log(lp, "httpserver_"), m_token("", &m_log) {
+							   XrdOucEnv * /*envP*/)
+	: m_log(lp, "httpserver_"), m_token("", &m_log) {
 	m_log.Say("------ Initializing the HTTP filesystem plugin.");
 	if (!Config(lp, configfn)) {
 		throw std::runtime_error("Failed to configure HTTP filesystem plugin.");
@@ -130,7 +130,7 @@ bool HTTPFileSystem::Config(XrdSysLogger *lp, const char *configfn) {
 	}
 
 	if (!token_file.empty()) {
-		m_token = std::move(TokenFile(token_file, &m_log));
+		m_token = TokenFile(token_file, &m_log);
 	}
 
 	return true;

diff --git a/src/HTTPFileSystem.hh b/src/HTTPFileSystem.hh
@@ -109,7 +109,6 @@ class HTTPFileSystem : public XrdOss {
 	const TokenFile *getToken() const { return &m_token; }
 
   protected:
-	XrdOucEnv *m_env;
 	XrdSysError m_log;
 
 	bool handle_required_config(const std::string &name_from_config,

diff --git a/src/S3File.cc b/src/S3File.cc
@@ -758,7 +758,6 @@ ssize_t S3File::S3Cache::Read(S3File &file, char *buffer, off_t offset,
 		m_partial_hit_count += 1;
 	}
 	m_miss_bytes += miss_bytes;
-	unsigned fetch_attempts = 0;
 	while (req1_off != -1) {
 		std::unique_lock lk(m_mutex);
 		m_cv.wait(lk, [&] {
@@ -869,7 +868,6 @@ ssize_t S3File::S3Cache::Read(S3File &file, char *buffer, off_t offset,
 		// No caches serve our requests - we must kick off a new download
 		// std::cout << "Will download data via cache; req1 offset=" << req1_off
 		// << ", req2 offset=" << req2_off << "\n";
-		fetch_attempts++;
 		bool download_a = false, download_b = false, prefetch_b = false;
 		if (!m_a.m_inprogress && m_b.m_inprogress) {
 			m_a.m_off = req1_off / m_cache_entry_size * m_cache_entry_size;

diff --git a/src/S3FileSystem.cc b/src/S3FileSystem.cc
@@ -45,8 +45,8 @@ bool S3FileSystem::m_dir_marker = true;
 std::string S3FileSystem::m_dir_marker_name = ".pelican_dir_marker";
 
 S3FileSystem::S3FileSystem(XrdSysLogger *lp, const char *configfn,
-						   XrdOucEnv *envP)
-	: m_env(envP), m_log(lp, "s3_") {
+						   XrdOucEnv * /*envP*/)
+	: m_log(lp, "s3_") {
 	m_log.Say("------ Initializing the S3 filesystem plugin.");
 	if (!Config(lp, configfn)) {
 		throw std::runtime_error("Failed to configure S3 filesystem plugin.");

diff --git a/src/S3FileSystem.hh b/src/S3FileSystem.hh
@@ -138,7 +138,6 @@ class S3FileSystem : public XrdOss {
 	getS3AccessInfo(const std::string &exposedPath, std::string &object) const;
 
   private:
-	XrdOucEnv *m_env;
 	XrdSysError m_log;
 
 	// The filesystem logic can test for an empty object to see if there's

diff --git a/src/stl_string_utils.cc b/src/stl_string_utils.cc
@@ -151,9 +151,9 @@ std::string urlquote(const std::string input) {
 	std::string output;
 	output.reserve(3 * input.size());
 	for (char val : input) {
-		if ((val >= 48 || val <= 57) ||	 // Digits 0-9
-			(val >= 65 || val <= 90) ||	 // Uppercase A-Z
-			(val >= 97 || val <= 122) || // Lowercase a-z
+		if ((val >= 48 && val <= 57) ||	 // Digits 0-9
+			(val >= 65 && val <= 90) ||	 // Uppercase A-Z
+			(val >= 97 && val <= 122) || // Lowercase a-z
 			(val == 95 || val == 46 || val == 45 || val == 126 ||
 			 val == 47)) // '_.-~/'
 		{