cryptsetup: accept both "read-only" and "readonly" spellings

[elogind.git] / src / journal / cat.c

diff --git a/src/journal/cat.c b/src/journal/cat.c
index cdd46bcf5b7b41e3733faa2a17a83fc648ae3b6c..a95392ccb0fc7336e9df76eb22b64ed2e1cbd936 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -81,7 +81,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -91,10 +90,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 arg_identifier = NULL;
                         else {
                                 arg_identifier = strdup(optarg);
-                                if (!arg_identifier) {
-                                        log_error("Out of memory.");
-                                        return -ENOMEM;
-                                }
+                                if (!arg_identifier)
+                                        return log_oom();
                         }
                         break;