Module Name: src
Committed By: joerg
Date: Thu Nov 12 22:23:16 UTC 2020
Modified Files:
src/games/warp: intrp.c score.h sig.h util.c util.h
Log Message:
Avoid common symbols. Use __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/games/warp/intrp.c
cvs rdiff -u -r1.4 -r1.5 src/games/warp/score.h src/games/warp/sig.h
cvs rdiff -u -r1.5 -r1.6 src/games/warp/util.c src/games/warp/util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/warp/intrp.c
diff -u src/games/warp/intrp.c:1.6 src/games/warp/intrp.c:1.7
--- src/games/warp/intrp.c:1.6 Wed Nov 11 19:55:33 2020
+++ src/games/warp/intrp.c Thu Nov 12 22:23:16 2020
@@ -32,7 +32,7 @@ static char *getrealname(uid_t);
static char *skipinterp(const char *, const char *);
#endif
-static void abort_interp(void);
+__dead static void abort_interp(void);
void
intrp_init(char *tcbuf)
Index: src/games/warp/score.h
diff -u src/games/warp/score.h:1.4 src/games/warp/score.h:1.5
--- src/games/warp/score.h:1.4 Wed Nov 11 19:55:33 2020
+++ src/games/warp/score.h Thu Nov 12 22:23:16 2020
@@ -42,7 +42,7 @@ EXT char longlognam[128];
EXT char c INIT(' ');
void score_init(void);
-void wscore(void);
+__dead void wscore(void);
void display_status(void);
void wavescore(void);
void score(void);
Index: src/games/warp/sig.h
diff -u src/games/warp/sig.h:1.4 src/games/warp/sig.h:1.5
--- src/games/warp/sig.h:1.4 Tue Nov 10 22:42:19 2020
+++ src/games/warp/sig.h Thu Nov 12 22:23:16 2020
@@ -8,8 +8,8 @@
void sig_init(void);
void mytstp(void);
-void finalize(int status);
-void sig_catcher(int signo);
+__dead void finalize(int status);
+__dead void sig_catcher(int signo);
#ifdef SIGTSTP
void cont_catcher(int x);
void stop_catcher(int sig);
Index: src/games/warp/util.c
diff -u src/games/warp/util.c:1.5 src/games/warp/util.c:1.6
--- src/games/warp/util.c:1.5 Tue Nov 10 23:03:22 2020
+++ src/games/warp/util.c Thu Nov 12 22:23:16 2020
@@ -21,6 +21,8 @@
#include "INTERN.h"
#include "util.h"
+struct timespec timebuf;
+
void
util_init(void)
{
Index: src/games/warp/util.h
diff -u src/games/warp/util.h:1.5 src/games/warp/util.h:1.6
--- src/games/warp/util.h:1.5 Wed Nov 11 19:55:33 2020
+++ src/games/warp/util.h Thu Nov 12 22:23:16 2020
@@ -17,7 +17,7 @@
/* we get fractions of seconds from calling ftime on timebuf */
-EXT struct timespec timebuf;
+extern struct timespec timebuf;
#define roundsleep(x) (clock_gettime(CLOCK_REALTIME, &timebuf),sleep(timebuf.tv_nsec > 5000000000 ?x+1:x))
#define waiting 0
@@ -37,7 +37,7 @@ EXT int len_last_line_got INIT(0);
void util_init(void);
void movc3(int, char *, char *);
-void no_can_do(const char *);
+__dead void no_can_do(const char *);
int exdis(int);
void *safemalloc(size_t size);
char *safecpy(char *, const char *, size_t);
@@ -46,6 +46,6 @@ char *instr(const char *, const char *);
#ifdef SETUIDGID
int eaccess(const char *, mode_t);
#endif
-void prexit(const char *);
+__dead void prexit(const char *);
char *savestr(const char *);
char *getval(const char *, const char *);
