Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/games/warp Avoid common symbols. Use __dead.



details:   https://anonhg.NetBSD.org/src/rev/85aa45974d67
branches:  trunk
changeset: 942616:85aa45974d67
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Nov 12 22:23:16 2020 +0000

description:
Avoid common symbols. Use __dead.

diffstat:

 games/warp/intrp.c |  2 +-
 games/warp/score.h |  2 +-
 games/warp/sig.h   |  4 ++--
 games/warp/util.c  |  2 ++
 games/warp/util.h  |  6 +++---
 5 files changed, 9 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r ae341569489e -r 85aa45974d67 games/warp/intrp.c
--- a/games/warp/intrp.c        Thu Nov 12 22:11:03 2020 +0000
+++ b/games/warp/intrp.c        Thu Nov 12 22:23:16 2020 +0000
@@ -32,7 +32,7 @@
 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 -r ae341569489e -r 85aa45974d67 games/warp/score.h
--- a/games/warp/score.h        Thu Nov 12 22:11:03 2020 +0000
+++ b/games/warp/score.h        Thu Nov 12 22:23:16 2020 +0000
@@ -42,7 +42,7 @@
 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);
diff -r ae341569489e -r 85aa45974d67 games/warp/sig.h
--- a/games/warp/sig.h  Thu Nov 12 22:11:03 2020 +0000
+++ b/games/warp/sig.h  Thu Nov 12 22:23:16 2020 +0000
@@ -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 -r ae341569489e -r 85aa45974d67 games/warp/util.c
--- a/games/warp/util.c Thu Nov 12 22:11:03 2020 +0000
+++ b/games/warp/util.c Thu Nov 12 22:23:16 2020 +0000
@@ -21,6 +21,8 @@
 #include "INTERN.h"
 #include "util.h"
 
+struct timespec timebuf;
+
 void
 util_init(void)
 {
diff -r ae341569489e -r 85aa45974d67 games/warp/util.h
--- a/games/warp/util.h Thu Nov 12 22:11:03 2020 +0000
+++ b/games/warp/util.h Thu Nov 12 22:23:16 2020 +0000
@@ -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 @@
 
 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 @@
 #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 *);



Home | Main Index | Thread Index | Old Index