From bbe804325ec04ac0a4255944afd3c8897125f678 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Mar 2019 11:38:28 +0100 Subject: [PATCH] catalog: don't make catalog_entry_lang() clobber output params on failure A minor fix to bring this in-line with our coding style --- src/journal/catalog.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/journal/catalog.c b/src/journal/catalog.c index 4062f12c2d..abf725115c 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; } -- 2.25.1