From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Mar 2019 10:38:28 +0000 (+0100)
Subject: catalog: don't make catalog_entry_lang() clobber output params on failure
X-Git-Tag: v242-rc1~181^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbe804325ec04ac0a4255944afd3c8897125f678;p=thirdparty%2Fsystemd.git

catalog: don't make catalog_entry_lang() clobber output params on failure

A minor fix to bring this in-line with our coding style
---

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 4062f12c2df..abf725115c2 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -209,9 +209,15 @@ int catalog_file_lang(const char* filename, char **lang) {
         return 1;
 }
 
-static int catalog_entry_lang(const char* filename, int line,
-                              const char* t, const char* deflang, char **lang) {
+static int catalog_entry_lang(
+                const char* filename,
+                unsigned line,
+                const char* t,
+                const char* deflang,
+                char **ret) {
+
         size_t c;
+        char *z;
 
         c = strlen(t);
         if (c < 2)
@@ -233,10 +239,11 @@ static int catalog_entry_lang(const char* filename, int line,
                                     filename, line);
         }
 
-        *lang = strdup(t);
-        if (!*lang)
-                        return -ENOMEM;
+        z = strdup(t);
+        if (!z)
+                return -ENOMEM;
 
+        *ret = z;
         return 0;
 }