From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 7 Jul 2021 09:40:16 +0000 (+0200)
Subject: networkd: minor refactoring
X-Git-Tag: v250-rc1~952^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F20109%2Fhead;p=thirdparty%2Fsystemd.git

networkd: minor refactoring
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 7b36b481419..7734c82721e 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -110,6 +110,7 @@ int manager_get_route_table_from_string(const Manager *m, const char *s, uint32_
 int manager_get_route_table_to_string(const Manager *m, uint32_t table, char **ret) {
         _cleanup_free_ char *str = NULL;
         const char *s;
+        int r;
 
         assert(m);
         assert(ret);
@@ -121,17 +122,13 @@ int manager_get_route_table_to_string(const Manager *m, uint32_t table, char **r
         if (!s)
                 s = hashmap_get(m->route_table_names_by_number, UINT32_TO_PTR(table));
 
-        if (s) {
+        if (s)
                 /* Currently, this is only used in debugging logs. To not confuse any bug
                  * reports, let's include the table number. */
-                if (asprintf(&str, "%s(%" PRIu32 ")", s, table) < 0)
-                        return -ENOMEM;
-
-                *ret = TAKE_PTR(str);
-                return 0;
-        }
-
-        if (asprintf(&str, "%" PRIu32, table) < 0)
+                r = asprintf(&str, "%s(%" PRIu32 ")", s, table);
+        else
+                r = asprintf(&str, "%" PRIu32, table);
+        if (r < 0)
                 return -ENOMEM;
 
         *ret = TAKE_PTR(str);