remove duplicate

[bsdgames-darwin.git] / rogue / machdep.c

diff --git a/rogue/machdep.c b/rogue/machdep.c
index 747eae0a530592372837d5424bd29b5c6f6068f1..e6d6292deb09d1a9dd1ca4ac959644ff3a1e45aa 100644 (file)
--- a/rogue/machdep.c
+++ b/rogue/machdep.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.15 2007/12/27 23:53:00 dholland Exp $    */
+/*     $NetBSD: machdep.c,v 1.20 2012/12/01 11:37:27 mbalmer Exp $     */
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)machdep.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: machdep.c,v 1.15 2007/12/27 23:53:00 dholland Exp $");
+__RCSID("$NetBSD: machdep.c,v 1.20 2012/12/01 11:37:27 mbalmer Exp $");
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ __RCSID("$NetBSD: machdep.c,v 1.15 2007/12/27 23:53:00 dholland Exp $");
  *
  * All UNIX code should be included between the single "#ifdef UNIX" at the
  * top of this file, and the "#endif" at the bottom.
- * 
+ *
  * To change a routine to include a new UNIX system, simply #ifdef the
  * existing routine, as in the following example:
  *
@@ -84,7 +84,7 @@ __RCSID("$NetBSD: machdep.c,v 1.15 2007/12/27 23:53:00 dholland Exp $");
  *      #endif
  *      }
  *
- * Appropriate variations of this are of course acceptible.
+ * Appropriate variations of this are of course acceptable.
  * The use of "#elseif" is discouraged because of non-portability.
  * If the correct #define doesn't exist, "UNIX_SYSV" in this case, make it up
  * and insert it in the list at the top of the file.  Alter the CFLAGS
@@ -128,7 +128,7 @@ __RCSID("$NetBSD: machdep.c,v 1.15 2007/12/27 23:53:00 dholland Exp $");
  */
 
 void
-md_slurp()
+md_slurp(void)
 {
        (void)fpurge(stdin);
 }
@@ -150,7 +150,7 @@ md_slurp()
  */
 
 void
-md_heed_signals()
+md_heed_signals(void)
 {
        signal(SIGINT, onintr);
        signal(SIGQUIT, byebye);
@@ -170,7 +170,7 @@ md_heed_signals()
  */
 
 void
-md_ignore_signals()
+md_ignore_signals(void)
 {
        signal(SIGQUIT, SIG_IGN);
        signal(SIGINT, SIG_IGN);
@@ -187,15 +187,14 @@ md_ignore_signals()
  */
 
 int
-md_get_file_id(fname)
-       const char *fname;
+md_get_file_id(const char *fname)
 {
        struct stat sbuf;
 
        if (stat(fname, &sbuf)) {
                return(-1);
        }
-       return((int) sbuf.st_ino);
+       return((int)sbuf.st_ino);
 }
 
 /* md_link_count():
@@ -207,13 +206,12 @@ md_get_file_id(fname)
  */
 
 int
-md_link_count(fname)
-       const char *fname;
+md_link_count(const char *fname)
 {
        struct stat sbuf;
 
        stat(fname, &sbuf);
-       return((int) sbuf.st_nlink);
+       return((int)sbuf.st_nlink);
 }
 
 /* md_gct(): (Get Current Time)
@@ -227,12 +225,11 @@ md_link_count(fname)
  * system doesn't provide all of the time units requested here, then you
  * can provide only those that it does, and return zeros for the others.
  * If you cannot provide good time values, then users may be able to copy
- * saved-game files and play them.  
+ * saved-game files and play them.
  */
 
 void
-md_gct(rt_buf)
-       struct rogue_time *rt_buf;
+md_gct(struct rogue_time *rt_buf)
 {
        struct tm *t;
        time_t seconds;
@@ -259,22 +256,20 @@ md_gct(rt_buf)
  * exactly the same here.
  * Or if md_gct() is implemented correctly, but your system does not provide
  * file modification dates, you may return some date far in the past so
- * that the program will never know that a saved-game file being modified.  
+ * that the program will never know that a saved-game file being modified.
  * You may also do this if you wish to be able to restore games from
  * saved-games that have been modified.
  */
 
 void
-md_gfmt(fname, rt_buf)
-       const char *fname;
-       struct rogue_time *rt_buf;
+md_gfmt(const char *fname, struct rogue_time *rt_buf)
 {
        struct stat sbuf;
        time_t seconds;
        struct tm *t;
 
        stat(fname, &sbuf);
-       seconds = (long) sbuf.st_mtime;
+       seconds = sbuf.st_mtime;
        t = localtime(&seconds);
 
        rt_buf->year = t->tm_year;
@@ -297,8 +292,7 @@ md_gfmt(fname, rt_buf)
  */
 
 boolean
-md_df(fname)
-       const char *fname;
+md_df(const char *fname)
 {
        if (unlink(fname)) {
                return(0);
@@ -316,13 +310,13 @@ md_df(fname)
  */
 
 const char *
-md_gln()
+md_gln(void)
 {
        struct passwd *p;
 
        if (!(p = getpwuid(getuid())))
-               return((char *)NULL);
-       return(p->pw_name);
+               return NULL;
+       return p->pw_name;
 }
 
 /* md_sleep:
@@ -335,10 +329,9 @@ md_gln()
  */
 
 void
-md_sleep(nsecs)
-       int nsecs;
+md_sleep(int nsecs)
 {
-       (void) sleep(nsecs);
+       (void)sleep(nsecs);
 }
 
 /* md_getenv()
@@ -365,8 +358,7 @@ md_sleep(nsecs)
  */
 
 char *
-md_getenv(name)
-       const char *name;
+md_getenv(const char *name)
 {
        char *value;
 
@@ -383,9 +375,8 @@ md_getenv(name)
  * when no more memory can be allocated.
  */
 
-char *
-md_malloc(n)
-       int n;
+void *
+md_malloc(size_t n)
 {
        char *t;
 
@@ -404,7 +395,7 @@ md_malloc(n)
  * You need to find some single random integer, such as:
  *   process id.
  *   current time (minutes + seconds) returned from md_gct(), if implemented.
- *   
+ *
  * It will not help to return "get_rand()" or "rand()" or the return value of
  * any pseudo-RNG.  If you don't have a random number, you can just return 1,
  * but this means your games will ALWAYS start the same way, and will play
@@ -412,12 +403,12 @@ md_malloc(n)
  */
 
 int
-md_gseed()
+md_gseed(void)
 {
        time_t seconds;
 
        time(&seconds);
-       return((int) seconds);
+       return((int)seconds);
 }
 
 /* md_exit():
@@ -428,8 +419,7 @@ md_gseed()
  */
 
 void
-md_exit(status)
-       int status;
+md_exit(int status)
 {
        exit(status);
 }
@@ -446,10 +436,9 @@ md_exit(status)
  */
 
 void
-md_lock(l)
-       boolean l;
+md_lock(boolean l)
 {
-       static int fd;
+       static int fd = -1;
        short tries;
 
        if (l) {
@@ -464,7 +453,7 @@ md_lock(l)
                        if (!flock(fd, LOCK_EX|LOCK_NB))
                                return;
        } else {
-               (void)flock(fd, LOCK_NB);
+               (void)flock(fd, LOCK_UN|LOCK_NB);
                (void)close(fd);
        }
 }
@@ -482,8 +471,7 @@ md_lock(l)
  */
 
 void
-md_shell(shell)
-       const char *shell;
+md_shell(const char *shell)
 {
        int w;
        pid_t pid;
@@ -493,7 +481,7 @@ md_shell(shell)
        case -1:
                break;
        case 0:
-               execl(shell, shell, (char *) 0);
+               execl(shell, shell, (char *)NULL);
                _exit(255);
        default:
                waitpid(pid, &w, 0);
@@ -501,4 +489,4 @@ md_shell(shell)
        }
 }
 
-#endif
+#endif /* UNIX */