From: Daniel Mack <daniel@zonque.org>
Date: Tue, 22 Mar 2022 17:26:55 +0000 (+0100)
Subject: timesyncd: clean up server_name_new()
X-Git-Tag: v251-rc2~152^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=feb219c99714f5bd0b632d1699d24bbd34225ca4;p=thirdparty%2Fsystemd.git

timesyncd: clean up server_name_new()

Use `LIST_APPEND()` in favour of `LIST_FIND_TAIL()` + `LIST_INSERT_AFTER()`.
Also use a switch/case statement instead of if/else if.
---

diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c
index c8ff46f3992..3b7d79323fe 100644
--- a/src/timesync/timesyncd-server.c
+++ b/src/timesync/timesyncd-server.c
@@ -66,7 +66,7 @@ int server_name_new(
                 ServerType type,
                 const char *string) {
 
-        ServerName *n, *tail;
+        ServerName *n;
 
         assert(m);
         assert(string);
@@ -86,20 +86,22 @@ int server_name_new(
                 return -ENOMEM;
         }
 
-        if (type == SERVER_SYSTEM) {
-                LIST_FIND_TAIL(names, m->system_servers, tail);
-                LIST_INSERT_AFTER(names, m->system_servers, tail, n);
-        } else if (type == SERVER_LINK) {
-                LIST_FIND_TAIL(names, m->link_servers, tail);
-                LIST_INSERT_AFTER(names, m->link_servers, tail, n);
-        } else if (type == SERVER_FALLBACK) {
-                LIST_FIND_TAIL(names, m->fallback_servers, tail);
-                LIST_INSERT_AFTER(names, m->fallback_servers, tail, n);
-        } else if (type == SERVER_RUNTIME) {
-                LIST_FIND_TAIL(names, m->runtime_servers, tail);
-                LIST_INSERT_AFTER(names, m->runtime_servers, tail, n);
-        } else
+        switch (type) {
+        case SERVER_SYSTEM:
+                LIST_APPEND(names, m->system_servers, n);
+                break;
+        case SERVER_LINK:
+                LIST_APPEND(names, m->link_servers, n);
+                break;
+        case SERVER_FALLBACK:
+                LIST_APPEND(names, m->fallback_servers, n);
+                break;
+        case SERVER_RUNTIME:
+                LIST_APPEND(names, m->runtime_servers, n);
+                break;
+        default:
                 assert_not_reached();
+        }
 
         if (type != SERVER_FALLBACK &&
             m->current_server_name &&