The previous rev. was committed accidentally, revert.

diff --git a/include/prototypes.h b/include/prototypes.h
index 1bf485d155739733a118d9b7538cb09da64243ed..3caf3ba60d4f0e28c6bec82cbc665cc442544016 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -421,33 +421,28 @@ extern int pln_identchance(struct plnstr *, int, int);
 extern void pln_set_tech(struct plnstr *, int);
 /* pr.c */
 extern void pr(s_char *, ...) ATTRIBUTE((format (printf, 1, 2)));
-extern void UTF8prnf(s_char *buf);
+extern void prnf(s_char *buf);
 extern void pr_id(struct player *, int, s_char *, ...)
                ATTRIBUTE((format (printf, 3, 4)));
 extern void pr_flash(struct player *, s_char *, ...)
                ATTRIBUTE((format (printf, 2, 3)));
-extern void UTF8pr_flash(struct player *, s_char *, ...)
-               ATTRIBUTE((format (printf, 2, 3)));
 extern void pr_inform(struct player *, s_char *, ...)
                ATTRIBUTE((format (printf, 2, 3)));
 extern void pr_wall(s_char *, ...)
                ATTRIBUTE((format (printf, 1, 2)));
 extern void pr_player(struct player *pl, int id, s_char *buf);
-extern void UTF8pr_player(struct player *pl, int id, s_char *buf);
 extern void pr_hilite(s_char *buf);
 extern void prredir(s_char *redir);
 extern void prexec(s_char *file);
 extern void prprompt(int min, int btu);
 extern void showvers(int vers);
 extern int prmptrd(s_char *prompt, s_char *str, int size);
-extern int UTF8prmptrd(s_char *prompt, s_char *str, int size);
 extern void prdate(void);
 extern void prxy(s_char *format, coord x, coord y, natid country);
 extern void PR(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3)));
 extern void PRdate(natid cn);
 extern void pr_beep(void);
 extern void mpr(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3)));
-extern void prtoascii(s_char *buf);
 
 /* radmap.c */
 extern int deltx(struct range *, coord);

diff --git a/src/server/main.c b/src/server/main.c
index ae4269341a33d14282f65ec8a84977798eee7380..4acc8dd618dfecaa722d0041903dd6907baa511a 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -415,7 +415,7 @@ panic(int sig)
 void
 shutdwn(int sig)
 {
-    struct player *p,*phold;
+    struct player *p;
     time_t now;
 
 #if defined(__linux__) && defined(_EMPTH_POSIX)
@@ -443,8 +443,7 @@ shutdwn(int sig)
 
     logerror("Shutdown commencing (cleaning up threads.)");
 
-    p = player_next(0);
-    while (p != 0) {
+    for (p = player_next(0); p != 0; p = player_next(p)) {
        if (p->state != PS_PLAYING)
            continue;
        pr_flash(p, "Server shutting down...\n");
@@ -453,9 +452,7 @@ shutdwn(int sig)
        if (p->command) {
            pr_flash(p, "Shutdown aborting command\n");
        }
-       phold = p;
-       p = player_next(p);
-       empth_wakeup(phold->proc);
+       empth_wakeup(p->proc);
     }
 
     if (!sig) {