summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-05 20:09:41 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-05 21:07:55 -0500
commit1075122f42211ddb319126d6713a68a05056cd9d (patch)
treed0c9905660050869dc419eb06c63f5973c3d8791 /src/journal
parent2d26d8e07ee680995f96597a1cd713dd81491b89 (diff)
journalctl: replace string_erase with memset('x')
The compiler should not be able to optimize out the memset, because optarg is global memory. In this case, not making the argument an empty string is nicer, so just use an open-coded version of string_erase from before the explicit_bzero change.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journalctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 2639fd6cf5..9ad6f115a1 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -686,7 +686,9 @@ static int parse_argv(int argc, char *argv[]) {
r = free_and_strdup(&arg_verify_key, optarg);
if (r < 0)
return r;
- string_erase(optarg);
+ /* Use memset not string_erase so this doesn't look confusing
+ * in ps or htop output. */
+ memset(optarg, 'x', strlen(optarg));
arg_merge = false;
break;