From c26b13d8bb42925f95eb1e8d8eaf5f54eeecfea4 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Fri, 19 Feb 2021 03:00:22 +1100
Subject: [PATCH] Small cleanup to d7eab6894c6eb6d94d1159189814fe20783e1611

---
 src/server/campaignd/server.cpp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/server/campaignd/server.cpp b/src/server/campaignd/server.cpp
index f23d5be86eb0..aa5d598be0fc 100644
--- a/src/server/campaignd/server.cpp
+++ b/src/server/campaignd/server.cpp
@@ -216,16 +216,12 @@ bool have_wml(const utils::optional_reference<const config>& cfg)
  * Null WML objects are skipped.
  */
 template<typename... Vals>
-std::optional<std::vector<std::string>> multi_find_illegal_names(const Vals&... items)
+std::optional<std::vector<std::string>> multi_find_illegal_names(const Vals&... args)
 {
 	std::vector<std::string> names;
-	((items && check_names_legal(*items, &names)), ...);
+	((args && check_names_legal(*args, &names)), ...);
 
-	if(!names.empty()) {
-		return names;
-	} else {
-		return std::nullopt;
-	}
+	return !names.empty() ? std::optional(names) : std::nullopt;
 }
 
 /**
@@ -234,16 +230,12 @@ std::optional<std::vector<std::string>> multi_find_illegal_names(const Vals&...
  * Null WML objects are skipped.
  */
 template<typename... Vals>
-std::optional<std::vector<std::string>> multi_find_case_conflicts(const Vals&... items)
+std::optional<std::vector<std::string>> multi_find_case_conflicts(const Vals&... args)
 {
 	std::vector<std::string> names;
-	((items && check_case_insensitive_duplicates(*items, &names)), ...);
+	((args && check_case_insensitive_duplicates(*args, &names)), ...);
 
-	if(!names.empty()) {
-		return names;
-	} else {
-		return std::nullopt;
-	}
+	return !names.empty() ? std::optional(names) : std::nullopt;
 }
 
 /**