diff options
| author |   jmc <jmc@NetBSD.org> | 2005-07-01 06:04:46 +0000 |
|---|---|---|
| committer | jmc <jmc@NetBSD.org> | 2005-07-01 06:04:46 +0000 |
| commit | 4fe92d1fcdbb2fc53d5d338814045f676c06cc4a (patch) | |
| tree | 9c573af7165124e541518f30ca2b526fbb2fc162 /battlestar/getcom.c | |
| parent | cd55bb615f356f190eb2f57ad04366ecece7a545 (diff) | |
| download | bsdgames-darwin-4fe92d1fcdbb2fc53d5d338814045f676c06cc4a.tar.gz bsdgames-darwin-4fe92d1fcdbb2fc53d5d338814045f676c06cc4a.tar.zst bsdgames-darwin-4fe92d1fcdbb2fc53d5d338814045f676c06cc4a.zip | |
KNF and WARNS=3
Diffstat (limited to 'battlestar/getcom.c')
| -rw-r--r-- | battlestar/getcom.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/battlestar/getcom.c b/battlestar/getcom.c index 1b60e11f..46bcd2c1 100644 --- a/battlestar/getcom.c +++ b/battlestar/getcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: getcom.c,v 1.12 2004/11/05 21:30:31 dsl Exp $ */ +/* $NetBSD: getcom.c,v 1.13 2005/07/01 06:04:54 jmc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,17 +34,14 @@ #if 0 static char sccsid[] = "@(#)getcom.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getcom.c,v 1.12 2004/11/05 21:30:31 dsl Exp $"); +__RCSID("$NetBSD: getcom.c,v 1.13 2005/07/01 06:04:54 jmc Exp $"); #endif #endif /* not lint */ #include "extern.h" -char * -getcom(buf, size, prompt, error) - char *buf; - int size; - const char *prompt, *error; +char * +getcom(char *buf, int size, const char *prompt, const char *error) { for (;;) { fputs(prompt, stdout); @@ -61,7 +58,7 @@ getcom(buf, size, prompt, error) if (error) puts(error); } - /* If we didn't get to the end of the line, don't read it in next time. */ + /* If we didn't get to the end of line, don't read it in next time. */ if (buf[strlen(buf) - 1] != '\n') { int i; while ((i = getchar()) != '\n' && i != EOF) @@ -76,9 +73,7 @@ getcom(buf, size, prompt, error) * and leaves it unchanged if flag = 0 */ char * -getword(buf1, buf2, flag) - char *buf1, *buf2; - int flag; +getword(char *buf1, char *buf2, int flag) { int cnt; @@ -90,10 +85,12 @@ getword(buf1, buf2, flag) *buf2 = 0; return (0); } - while (cnt < WORDLEN && *buf1 && !isspace((unsigned char)*buf1) && *buf1 != ',') + while (cnt < WORDLEN && *buf1 && + !isspace((unsigned char)*buf1) && *buf1 != ',') if (flag < 0) { if (isupper((unsigned char)*buf1)) { - *buf2++ = tolower((unsigned char)*buf1++); + *buf2++ = + tolower((unsigned char)*buf1++); cnt++; } else { *buf2++ = *buf1++; @@ -101,7 +98,8 @@ getword(buf1, buf2, flag) } } else if (flag > 0) { if (islower((unsigned char)*buf1)) { - *buf2++ = toupper((unsigned char)*buf1++); + *buf2++ = + toupper((unsigned char)*buf1++); cnt++; } else { *buf2++ = *buf1++; |