diff options
| author |   joerg <joerg@NetBSD.org> | 2020-11-12 22:23:16 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2020-11-12 22:23:16 +0000 |
| commit | da6a856c31649c6fc011d45d51542876e1b13539 (patch) | |
| tree | a5261af3b8fa6a1c78bb76f6d22b65b1daf29d1f | |
| parent | 0b4c3861ae9de303c21256a9cc084c79c4fed743 (diff) | |
| download | bsdgames-darwin-da6a856c31649c6fc011d45d51542876e1b13539.tar.gz bsdgames-darwin-da6a856c31649c6fc011d45d51542876e1b13539.tar.zst bsdgames-darwin-da6a856c31649c6fc011d45d51542876e1b13539.zip | |
Avoid common symbols. Use __dead.
| -rw-r--r-- | warp/intrp.c | 2 | ||||
| -rw-r--r-- | warp/score.h | 2 | ||||
| -rw-r--r-- | warp/sig.h | 4 | ||||
| -rw-r--r-- | warp/util.c | 2 | ||||
| -rw-r--r-- | warp/util.h | 6 |
5 files changed, 9 insertions, 7 deletions
diff --git a/warp/intrp.c b/warp/intrp.c index 2b6df825..e3f615b0 100644 --- a/warp/intrp.c +++ b/warp/intrp.c @@ -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) diff --git a/warp/score.h b/warp/score.h index c3810c04..a47521f0 100644 --- a/warp/score.h +++ b/warp/score.h @@ -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); @@ -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); diff --git a/warp/util.c b/warp/util.c index 76cc4dc7..2b5a638f 100644 --- a/warp/util.c +++ b/warp/util.c @@ -21,6 +21,8 @@ #include "INTERN.h" #include "util.h" +struct timespec timebuf; + void util_init(void) { diff --git a/warp/util.h b/warp/util.h index 444e0866..ba7dbe3d 100644 --- a/warp/util.h +++ b/warp/util.h @@ -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 *); |