Remove some unnecessary casts.

[bsdgames-darwin.git] / sail / lo_main.c

diff --git a/sail/lo_main.c b/sail/lo_main.c
index c4f3a143bb42c947f0e07fb5d6a8377cb2a82660..c86daf7afe10ac3aecfb74c3502cdd412e540baa 100644 (file)
--- a/sail/lo_main.c
+++ b/sail/lo_main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $  */
+/*     $NetBSD: lo_main.c,v 1.15 2009/03/14 18:41:21 dholland Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,11 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lo_main.c  8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)lo_main.c  8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $";
+__RCSID("$NetBSD: lo_main.c,v 1.15 2009/03/14 18:41:21 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,22 +43,25 @@ static char rcsid[] = "$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $";
  *
  * -l force a long listing (print out real usernames)
  */
-#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <pwd.h>
-#include "externs.h"
+#include "extern.h"
 #include "pathnames.h"
 
-char *title[] = {
+const char *const title[] = {
        "Admiral", "Commodore", "Captain", "Captain",
        "Captain", "Captain", "Captain", "Commander",
        "Commander", "Lieutenant"
 };
 
-lo_main()
+int
+lo_main(void)
 {
        FILE *fp;
        char sbuf[32];
-       int n = 0, people;
+       int n = 0, npeople;
        struct passwd *pass;
        struct logs log;
        struct ship *ship;
@@ -70,7 +70,7 @@ lo_main()
                perror(_PATH_LOGFILE);
                exit(1);
        }
-       switch (fread((char *)&people, sizeof people, 1, fp)) {
+       switch (fread(&npeople, sizeof npeople, 1, fp)) {
        case 0:
                printf("Nobody has sailed yet.\n");
                exit(0);
@@ -80,18 +80,19 @@ lo_main()
                perror(_PATH_LOGFILE);
                exit(1);
        }
-       while (fread((char *)&log, sizeof log, 1, fp) == 1 &&
+       while (fread(&log, sizeof log, 1, fp) == 1 &&
               log.l_name[0] != '\0') {
                if (longfmt && (pass = getpwuid(log.l_uid)) != NULL)
-                       (void) sprintf(sbuf, "%10.10s (%s)",
-                               log.l_name, pass->pw_name);
+                       snprintf(sbuf, sizeof(sbuf),
+                               "%10.10s (%s)", log.l_name, pass->pw_name);
                else
-                       (void) sprintf(sbuf, "%20.20s", log.l_name);
+                       snprintf(sbuf, sizeof(sbuf),
+                               "%20.20s", log.l_name);
                ship = &scene[log.l_gamenum].ship[log.l_shipnum];
                printf("%-10s %21s of the %15s %3d points, %5.2f equiv\n",
                        title[n++], sbuf, ship->shipname, log.l_netpoints,
                        (float) log.l_netpoints / ship->specs->pts);
        }
-       printf("\n%d people have played.\n", people);
+       printf("\n%d people have played.\n", npeople);
        return 0;
 }