diff options
Diffstat (limited to 'atc/log.c')
| -rw-r--r-- | atc/log.c | 94 |
1 files changed, 49 insertions, 45 deletions
@@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.15 2005/08/10 16:10:51 rpaulo Exp $ */ +/* $NetBSD: log.c,v 1.16 2005/08/10 17:53:28 rpaulo Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: log.c,v 1.15 2005/08/10 16:10:51 rpaulo Exp $"); +__RCSID("$NetBSD: log.c,v 1.16 2005/08/10 17:53:28 rpaulo Exp $"); #endif #endif /* not lint */ @@ -106,7 +106,7 @@ open_score_file(void) old_mask = umask(0); score_fd = open(_PATH_SCORE, O_CREAT|O_RDWR, 0664); - umask(old_mask); + (void)umask(old_mask); if (score_fd < 0) { warn("open %s", _PATH_SCORE); return; @@ -159,34 +159,35 @@ log_score(int list_em) } for (;;) { good = fscanf(score_fp, SCORE_SCANF_FMT, - score[num_scores].name, - score[num_scores].host, - score[num_scores].game, - &score[num_scores].planes, - &score[num_scores].time, - &score[num_scores].real_time); + score[num_scores].name, + score[num_scores].host, + score[num_scores].game, + &score[num_scores].planes, + &score[num_scores].time, + &score[num_scores].real_time); if (good != 6 || ++num_scores >= NUM_SCORES) break; } if (!test_mode && !list_em) { if ((pw = (struct passwd *) getpwuid(getuid())) == NULL) { - fprintf(stderr, + (void)fprintf(stderr, "getpwuid failed for uid %d. Who are you?\n", (int)getuid()); return (-1); } - strcpy(thisscore.name, pw->pw_name); - uname(&lname); - strlcpy(thisscore.host, lname.nodename, sizeof(thisscore.host)); + (void)strcpy(thisscore.name, pw->pw_name); + (void)uname(&lname); + (void)strlcpy(thisscore.host, lname.nodename, + sizeof(thisscore.host)); cp = strrchr(filename, '/'); if (cp == NULL) { - fprintf(stderr, "log: where's the '/' in %s?\n", + (void)fprintf(stderr, "log: where's the '/' in %s?\n", filename); return (-1); } cp++; - strcpy(thisscore.game, cp); + (void)strcpy(thisscore.game, cp); thisscore.time = clck; thisscore.planes = safe_planes; @@ -200,7 +201,7 @@ log_score(int list_em) score[i].time = thisscore.time; score[i].planes = thisscore.planes; score[i].real_time = - thisscore.real_time; + thisscore.real_time; changed++; } found++; @@ -212,36 +213,36 @@ log_score(int list_em) if (thisscore.time > score[i].time) { if (num_scores < NUM_SCORES) num_scores++; - memcpy(&score[num_scores - 1], - &score[i], - sizeof (score[i])); - memcpy(&score[i], &thisscore, - sizeof (score[i])); + (void)memcpy(&score[num_scores - 1], + &score[i], sizeof (score[i])); + (void)memcpy(&score[i], &thisscore, + sizeof (score[i])); changed++; break; } } } if (!found && !changed && num_scores < NUM_SCORES) { - memcpy(&score[num_scores], &thisscore, - sizeof (score[num_scores])); + (void)memcpy(&score[num_scores], &thisscore, + sizeof (score[num_scores])); num_scores++; changed++; } if (changed) { if (found) - puts("You beat your previous score!"); + (void)puts("You beat your previous score!"); else - puts("You made the top players list!"); - qsort(score, num_scores, sizeof (*score), compar); + (void)puts("You made the top players list!"); + qsort(score, (size_t)num_scores, sizeof (*score), + compar); rewind(score_fp); for (i = 0; i < num_scores; i++) - fprintf(score_fp, "%s %s %s %d %d %d\n", - score[i].name, score[i].host, - score[i].game, score[i].planes, - score[i].time, score[i].real_time); - fflush(score_fp); + (void)fprintf(score_fp, "%s %s %s %d %d %d\n", + score[i].name, score[i].host, + score[i].game, score[i].planes, + score[i].time, score[i].real_time); + (void)fflush(score_fp); if (ferror(score_fp)) warn("error writing %s", _PATH_SCORE); /* It is just possible that updating an entry could @@ -249,41 +250,44 @@ log_score(int list_em) * truncate it. The seeks are required for stream/fd * synchronisation by POSIX.1. */ offset = ftell(score_fp); - lseek(fileno(score_fp), 0, SEEK_SET); - ftruncate(fileno(score_fp), offset); + (void)lseek(fileno(score_fp), (off_t)0, SEEK_SET); + (void)ftruncate(fileno(score_fp), (off_t)offset); rewind(score_fp); } else { if (found) - puts("You didn't beat your previous score."); + (void)puts( + "You didn't beat your previous score."); else - puts("You didn't make the top players list."); + (void)puts( + "You didn't make the top players list."); } - putchar('\n'); + (void)putchar('\n'); } #ifdef BSD - flock(fileno(score_fp), LOCK_UN); + (void)flock(fileno(score_fp), LOCK_UN); #endif #ifdef SYSV /* lock will evaporate upon close */ #endif - fclose(score_fp); - printf("%2s: %-8s %-8s %-18s %4s %9s %4s\n", "#", "name", "host", - "game", "time", "real time", "planes safe"); + (void)fclose(score_fp); + (void)printf("%2s: %-8s %-8s %-18s %4s %9s %4s\n", "#", "name", + "host", "game", "time", "real time", "planes safe"); (void)printf("-------------------------------------------------------"); (void)printf("------------------------\n"); for (i = 0; i < num_scores; i++) { cp = strchr(score[i].host, '.'); if (cp != NULL) *cp = '\0'; - printf("%2d: %-8s %-8s %-18s %4d %9s %4d\n", i + 1, - score[i].name, score[i].host, score[i].game, - score[i].time, timestr(score[i].real_time), - score[i].planes); + (void)printf("%2d: %-8s %-8s %-18s %4d %9s %4d\n", i + 1, + score[i].name, score[i].host, score[i].game, + score[i].time, timestr(score[i].real_time), + score[i].planes); } - putchar('\n'); + (void)putchar('\n'); return (0); } +/* ARGSUSED */ void log_score_quit(int dummy __attribute__((__unused__))) { |