X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fcat.c;h=a95392ccb0fc7336e9df76eb22b64ed2e1cbd936;hb=18cf1a1be5ae6985f211ec6f02504506da36b223;hp=31d76f33bb8c19ebf6f99c41f7398cce0c50c24d;hpb=9aac0b2c19c558b853da7a6d67a0929b2d44dee4;p=elogind.git

diff --git a/src/journal/cat.c b/src/journal/cat.c
index 31d76f33b..a95392ccb 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -6,16 +6,16 @@
   Copyright 2012 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -33,7 +33,7 @@
 #include "build.h"
 
 static char *arg_identifier = NULL;
-static char arg_priority = LOG_INFO;
+static int arg_priority = LOG_INFO;
 static bool arg_level_prefix = true;
 
 static int help(void) {
@@ -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;