empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resource: Trim unwanted trailing space from output

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-05 11:56:01 +01:00
parent c83cfbe33c
commit aafcd97476
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/reso.c
View file

@ -89,8 +89,8 @@ reso_hdr(void)
pr("RESOURCE\n"); pr("RESOURCE\n");
if (player->god) if (player->god)
pr("own "); pr("own ");
pr(" sect eff min gold fert oil uran "); pr(" sect eff min gold fert oil uran");
if (!player->god) if (!player->god)
pr("ter"); pr(" ter");
pr("\n"); pr("\n");
} }

34
tests/smoke/journal.log
View file

@ -2645,7 +2645,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0
@ -2987,7 +2987,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0
@ -3421,7 +3421,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0
@ -3949,7 +3949,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 0% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0
@ -4446,7 +4446,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 1% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 1% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 0% 11 0 61 21 0
@ -4819,7 +4819,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 2% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 2% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 1% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 1% 11 0 61 21 0
@ -5615,7 +5615,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 + 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 + 4% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 + 4% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 + 2% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 + 2% 11 0 61 21 0
@ -6577,7 +6577,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 o 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 o 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 +o 7% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 +o 7% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 o 0% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 o 0% 11 0 61 21 0
@ -7276,7 +7276,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 o 0% 0 0 82 58 0 Play#0 output Play#0 1 1 6,-16 o 0% 0 0 82 58 0
Play#0 output Play#0 1 1 1,-15 o 0% 6 0 67 32 0 Play#0 output Play#0 1 1 1,-15 o 0% 6 0 67 32 0
Play#0 output Play#0 1 1 3,-15 o 3% 11 0 61 21 0 Play#0 output Play#0 1 1 3,-15 o 3% 11 0 61 21 0
@ -8005,7 +8005,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 29 0 Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 29 0
Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 16 0 Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 16 0
Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 10 0 Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 10 0
@ -8922,7 +8922,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 11 0 Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 11 0
Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 7 0 Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 7 0
Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 4 0 Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 4 0
@ -9717,7 +9717,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 5 0 Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 5 0
Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 3 0 Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 3 0
Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 2 0 Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 2 0
@ -10406,7 +10406,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 2 0 Play#0 output Play#0 1 1 6,-16 o 100% 0 0 82 2 0
Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 2 0 Play#0 output Play#0 1 1 1,-15 o 100% 6 0 67 2 0
Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 0 0 Play#0 output Play#0 1 1 3,-15 o 100% 11 0 61 0 0
@ -11984,7 +11984,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 oj 100% 0 0 82 0 0 Play#0 output Play#0 1 1 6,-16 oj 100% 0 0 82 0 0
Play#0 output Play#0 1 1 1,-15 ok 100% 6 0 67 1 0 Play#0 output Play#0 1 1 1,-15 ok 100% 6 0 67 1 0
Play#0 output Play#0 1 1 3,-15 oj 100% 11 0 61 0 0 Play#0 output Play#0 1 1 3,-15 oj 100% 11 0 61 0 0
@ -13131,7 +13131,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 j 100% 0 0 82 0 0 Play#0 output Play#0 1 1 6,-16 j 100% 0 0 82 0 0
Play#0 output Play#0 1 1 1,-15 k 100% 6 0 67 1 0 Play#0 output Play#0 1 1 1,-15 k 100% 6 0 67 1 0
Play#0 output Play#0 1 1 3,-15 j 100% 11 0 61 0 0 Play#0 output Play#0 1 1 3,-15 j 100% 11 0 61 0 0
@ -14170,7 +14170,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 j 100% 0 0 82 0 0 Play#0 output Play#0 1 1 6,-16 j 100% 0 0 82 0 0
Play#0 output Play#0 1 1 1,-15 k 100% 6 0 67 1 0 Play#0 output Play#0 1 1 1,-15 k 100% 6 0 67 1 0
Play#0 output Play#0 1 1 3,-15 j 100% 11 0 61 0 0 Play#0 output Play#0 1 1 3,-15 j 100% 11 0 61 0 0
@ -15264,7 +15264,7 @@
Play#0 command resource Play#0 command resource
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 RESOURCE Play#0 output Play#0 1 RESOURCE
Play#0 output Play#0 1 own sect eff min gold fert oil uran Play#0 output Play#0 1 own sect eff min gold fert oil uran
Play#0 output Play#0 1 1 6,-16 j 100% 0 0 82 0 0 Play#0 output Play#0 1 1 6,-16 j 100% 0 0 82 0 0
Play#0 output Play#0 1 1 1,-15 k 100% 6 0 67 1 0 Play#0 output Play#0 1 1 1,-15 k 100% 6 0 67 1 0
Play#0 output Play#0 1 1 3,-15 j 100% 11 0 61 0 0 Play#0 output Play#0 1 1 3,-15 j 100% 11 0 61 0 0