Fix trailing whitespace

This commit is contained in:
Markus Armbruster 2008-09-17 21:09:14 -04:00
parent a9653c475b
commit d702068457
509 changed files with 922 additions and 922 deletions

View file

@ -312,16 +312,16 @@ fi
*)
echo "Removing existing server.log and journal.log"
if [ -f "../var/empire/server.log" ]
if [ -f "../var/empire/server.log" ]
then
rm "../var/empire/server.log"
fi
if [ -f "../var/empire/journal.log" ]
if [ -f "../var/empire/journal.log" ]
then
rm "../var/empire/journal.log"
fi
echo "Removing existing schedule"
if [ -f "../etc/empire/schedule" ]
if [ -f "../etc/empire/schedule" ]
then
>../etc/empire/schedule
fi
@ -357,7 +357,7 @@ fi
}
echo "Done (newcap_script / empire)."
echo ""
echo "TODO: Replace this with a real test script."
echo "Just do some rudimentary testing for now."
echo ""
@ -549,7 +549,7 @@ EOF
runfeed 8 << EOF
cen *
map #
read y
read y
exp c 0,0 50 gyyygh
des -7,-3 )
lost *
@ -590,7 +590,7 @@ EOF
runfeed 8 << EOF
cen *
map #
read y
read y
lost *
EOF
echo "Run an update"
@ -1033,10 +1033,10 @@ EOF
echo "Done (kill)."
cd "${BOXDIR}/${WORKDIR}/emp4/var/empire" || err "Could not cd to ${BOXDIR}/${WORKDIR}/emp4/var/empire"
echo "-- Start Server Log --"
cat server.log
cat server.log
echo "-- End of Server Log --"
echo "-- Start Journal Log --"
cat journal.log
cat journal.log
echo "-- End of Journal Log --"
echo "Server stopped"
;;

View file

@ -4,7 +4,7 @@ index ae851ae..872c363 100644
+++ b/src/lib/common/file.c
@@ -384,7 +384,7 @@ do_write(struct empfile *ep, void *buf, int id, int count)
return -1;
if (ep->flags & EFF_TYPED) {
- now = ep->flags & EFF_NOTIME ? (time_t)-1 : time(NULL);
+ now = ep->flags & EFF_NOTIME ? (time_t)-1 : (time_t)100;

View file

@ -3,7 +3,7 @@ index 8e410e6..b29c0a2 100644
--- a/src/lib/commands/lost.c
+++ b/src/lib/commands/lost.c
@@ -51,7 +51,7 @@ lost(void)
prdate();
nlost = 0;
- time(&now);

View file

@ -4,7 +4,7 @@ Index: empserver/src/lib/subs/pr.c
@@ -68,6 +68,13 @@
static void upr_player(struct player *pl, int id, char *buf);
static void outid(struct player *pl, int n);
+/* Hack for nightlybuild */
+char *
+ctime(const time_t *clock)
@ -22,5 +22,5 @@ Index: empserver/src/lib/subs/pr.c
- pr_id(player, C_PROMPT, "%d %d\n", min, btu);
+ pr_id(player, C_PROMPT, "0 640\n"); /* Hack for nightlybuild */
}
/*

View file

@ -8,5 +8,5 @@ Index: empserver/src/lib/global/constants.c
-char *pre_update_hook = "";
+char *pre_update_hook = "echo pre_update_hook executed here";
int max_idle = 15; /* session dies after max_idle minutes idle */
int sect_mob_max = 127; /* sector mobility limits */