summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2016-02-02 17:32:31 +0100
committerDaniel Mack <github@zonque.org>2016-02-02 17:32:31 +0100
commit14ddf4207ffece3b0843bd1250a64c41c32ac9ae (patch)
tree4f6863c989de0b55f7305464c154011578e72cc6 /src/journal
parentb72190e90f0846956e609075fb9113dba9bc8f0f (diff)
parent2c29d3324dbcab7720cc6bb5852b1a01daa6772c (diff)
Merge pull request #2506 from poettering/resolved-and-more
pid 1 fixes, resolved fixes, and more
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/cat.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 7fd4198df8..07c3df522c 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -34,7 +34,7 @@
#include "syslog-util.h"
#include "util.h"
-static char *arg_identifier = NULL;
+static const char *arg_identifier = NULL;
static int arg_priority = LOG_INFO;
static bool arg_level_prefix = true;
@@ -82,14 +82,10 @@ static int parse_argv(int argc, char *argv[]) {
return version();
case 't':
- free(arg_identifier);
if (isempty(optarg))
arg_identifier = NULL;
- else {
- arg_identifier = strdup(optarg);
- if (!arg_identifier)
- return log_oom();
- }
+ else
+ arg_identifier = optarg;
break;
case 'p':