unload lunload: Say "Can't unload" instead of "Can't load"

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index ee3954ace60592fb756cc7fce71be2e6096e7f47..9eba3f3bd6ceb1ad045b93ec0f7d7c8853a64704 100644 (file)
--- 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 6f83a4af35f8e0915603bfd18de9b0b4b68c7247..317136c8db932a2439537fbba85040c10d0e08b4 100644 (file)
--- 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 3848c358970dc14160b45c89c5e73b202567f5b1..5bf95ab6363271643c2dc8aea72d7ee8e6e5611d 100644 (file)
--- 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 <COMM|"land"|"plane"> <SHIPS> <NUM|UNIT|PLANE>
     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 <COMM|"land"|"plane"> <UNITS> <NUM|UNITS|PLANES>
     Play#1 output Play#1 6 0 640
     Play#1 input load f -1