From eb56eb9b40950f1edcffdb7313f8de4f8572a6d5 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 17:34:26 +0100 Subject: treewide: simplify log_*_errno(r,...) immediately followed by "return r" --- src/journal/catalog.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/journal/catalog.c') diff --git a/src/journal/catalog.c b/src/journal/catalog.c index 67bf4ba017..03dddb48a5 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -341,17 +341,13 @@ static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb, return log_oom(); r = mkdir_p(d, 0775); - if (r < 0) { - log_error_errno(r, "Recursive mkdir %s: %m", d); - return r; - } + if (r < 0) + return log_error_errno(r, "Recursive mkdir %s: %m", d); r = fopen_temporary(database, &w, &p); - if (r < 0) { - log_error_errno(r, "Failed to open database for writing: %s: %m", - database); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to open database for writing: %s: %m", + database); zero(header); memcpy(header.signature, CATALOG_SIGNATURE, sizeof(header.signature)); -- cgit v1.2.3-54-g00ecf