From 581732dcd1bc86d9215a06c455338de1a5ba1de4 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 16 Sep 2017 09:59:55 +0200 Subject: [PATCH] unload lunload: Say "Can't unload" instead of "Can't load" Signed-off-by: Markus Armbruster --- src/lib/commands/load.c | 4 ++-- tests/load-tend/01-load-1 | 1 - tests/load-tend/journal.log | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index ee3954ac..9eba3f3b 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -87,7 +87,7 @@ load(void) else if (NULL != (ich = item_by_name(p))) type = EF_SECTOR; else { - pr("Can't load '%s'\n", p); + pr("Can't %sload '%s'\n", loading ? "" : "un", p); return RET_SYN; } @@ -216,7 +216,7 @@ lload(void) else if (NULL != (ich = item_by_name(p))) type = EF_SECTOR; else { - pr("Can't load '%s'\n", p); + pr("Can't %sload '%s'\n", loading ? "" : "un", p); return RET_SYN; } diff --git a/tests/load-tend/01-load-1 b/tests/load-tend/01-load-1 index 6f83a4af..317136c8 100644 --- a/tests/load-tend/01-load-1 +++ b/tests/load-tend/01-load-1 @@ -82,7 +82,6 @@ load x lload x unload x lunload x -| odd: "Can't load" even for unload | invalid ship load f -1 unload f -1 diff --git a/tests/load-tend/journal.log b/tests/load-tend/journal.log index 3848c358..5bf95ab6 100644 --- a/tests/load-tend/journal.log +++ b/tests/load-tend/journal.log @@ -32,12 +32,12 @@ Play#1 output Play#1 6 0 640 Play#1 input unload x Play#1 command unload - Play#1 output Play#1 1 Can't load 'x' + Play#1 output Play#1 1 Can't unload 'x' Play#1 output Play#1 1 Usage: unload Play#1 output Play#1 6 0 640 Play#1 input lunload x Play#1 command lunload - Play#1 output Play#1 1 Can't load 'x' + Play#1 output Play#1 1 Can't unload 'x' Play#1 output Play#1 1 Usage: lunload Play#1 output Play#1 6 0 640 Play#1 input load f -1