From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Mar 2019 10:39:11 +0000 (+0100)
Subject: catalog: be a bit less aggressive with line breaking. After all 109ch is what we... 
X-Git-Tag: v242-rc1~181^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0640d48afbb2db5f07aba98d795c89e450b16e28;p=thirdparty%2Fsystemd.git

catalog: be a bit less aggressive with line breaking. After all 109ch is what we going for
---

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index abf725115c2..5176b6013dd 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -222,21 +222,18 @@ static int catalog_entry_lang(
         c = strlen(t);
         if (c < 2)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "[%s:%u] Language too short.",
-                                       filename, line);
+                                       "[%s:%u] Language too short.", filename, line);
         if (c > 31)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "[%s:%u] language too long.", filename,
-                                       line);
+                                       "[%s:%u] language too long.", filename, line);
 
         if (deflang) {
                 if (streq(t, deflang)) {
-                        log_warning("[%s:%u] language specified unnecessarily",
-                                    filename, line);
+                        log_warning("[%s:%u] language specified unnecessarily", filename, line);
                         return 0;
-                } else
-                        log_warning("[%s:%u] language differs from default for file",
-                                    filename, line);
+                }
+
+                log_warning("[%s:%u] language differs from default for file", filename, line);
         }
 
         z = strdup(t);