From f000193ee5ff65a064634d011f29694bb833d2fb Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Wed, 7 Dec 2022 00:35:38 +0100
Subject: [PATCH] LibCore: Deduplicate some code in
 `Account::generate_shadow_file()`

---
 Userland/Libraries/LibCore/Account.cpp | 33 ++++++++++----------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/Userland/Libraries/LibCore/Account.cpp b/Userland/Libraries/LibCore/Account.cpp
index 17746d2cac..647688d72a 100644
--- a/Userland/Libraries/LibCore/Account.cpp
+++ b/Userland/Libraries/LibCore/Account.cpp
@@ -259,28 +259,19 @@ ErrorOr<DeprecatedString> Account::generate_shadow_file() const
     struct spwd* p;
     errno = 0;
     while ((p = getspent())) {
-        if (p->sp_namp == m_username) {
-            builder.appendff("{}:{}:{}:{}:{}:{}:{}:{}:{}\n",
-                m_username, m_password_hash,
-                (p->sp_lstchg == -1) ? "" : DeprecatedString::formatted("{}", p->sp_lstchg),
-                (p->sp_min == -1) ? "" : DeprecatedString::formatted("{}", p->sp_min),
-                (p->sp_max == -1) ? "" : DeprecatedString::formatted("{}", p->sp_max),
-                (p->sp_warn == -1) ? "" : DeprecatedString::formatted("{}", p->sp_warn),
-                (p->sp_inact == -1) ? "" : DeprecatedString::formatted("{}", p->sp_inact),
-                (p->sp_expire == -1) ? "" : DeprecatedString::formatted("{}", p->sp_expire),
-                (p->sp_flag == 0) ? "" : DeprecatedString::formatted("{}", p->sp_flag));
+        if (p->sp_namp == m_username)
+            builder.appendff("{}:{}", m_username, m_password_hash);
+        else
+            builder.appendff("{}:{}", p->sp_namp, p->sp_pwdp);
 
-        } else {
-            builder.appendff("{}:{}:{}:{}:{}:{}:{}:{}:{}\n",
-                p->sp_namp, p->sp_pwdp,
-                (p->sp_lstchg == -1) ? "" : DeprecatedString::formatted("{}", p->sp_lstchg),
-                (p->sp_min == -1) ? "" : DeprecatedString::formatted("{}", p->sp_min),
-                (p->sp_max == -1) ? "" : DeprecatedString::formatted("{}", p->sp_max),
-                (p->sp_warn == -1) ? "" : DeprecatedString::formatted("{}", p->sp_warn),
-                (p->sp_inact == -1) ? "" : DeprecatedString::formatted("{}", p->sp_inact),
-                (p->sp_expire == -1) ? "" : DeprecatedString::formatted("{}", p->sp_expire),
-                (p->sp_flag == 0) ? "" : DeprecatedString::formatted("{}", p->sp_flag));
-        }
+        builder.appendff(":{}:{}:{}:{}:{}:{}:{}\n",
+            (p->sp_lstchg == -1) ? "" : DeprecatedString::formatted("{}", p->sp_lstchg),
+            (p->sp_min == -1) ? "" : DeprecatedString::formatted("{}", p->sp_min),
+            (p->sp_max == -1) ? "" : DeprecatedString::formatted("{}", p->sp_max),
+            (p->sp_warn == -1) ? "" : DeprecatedString::formatted("{}", p->sp_warn),
+            (p->sp_inact == -1) ? "" : DeprecatedString::formatted("{}", p->sp_inact),
+            (p->sp_expire == -1) ? "" : DeprecatedString::formatted("{}", p->sp_expire),
+            (p->sp_flag == 0) ? "" : DeprecatedString::formatted("{}", p->sp_flag));
     }
     endspent();