From e7ab0e91278c80eee110edda0c737ea05a4f0704 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 23 May 2019 14:33:27 -0400
Subject: [PATCH] common/file_util: Remove unnecessary return at end of void
StripTailDirSlashes()
While we're at it, also invert the conditional into a guard clause.
---
src/common/file_util.cpp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index d8812837ea..2d9374783d 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -78,13 +78,15 @@ namespace FileUtil {
// Remove any ending forward slashes from directory paths
// Modifies argument.
static void StripTailDirSlashes(std::string& fname) {
- if (fname.length() > 1) {
- std::size_t i = fname.length();
- while (i > 0 && fname[i - 1] == DIR_SEP_CHR)
- --i;
- fname.resize(i);
+ if (fname.length() <= 1) {
+ return;
}
- return;
+
+ std::size_t i = fname.length();
+ while (i > 0 && fname[i - 1] == DIR_SEP_CHR) {
+ --i;
+ }
+ fname.resize(i);
}
bool Exists(const std::string& filename) {