d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings and bump WARNS to 6.

Browse Source
This commit is contained in:
Ruslan Ermilov 2005-02-23 20:59:03 +00:00
parent 8b8984d523
commit 423120f127
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=142328
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/fortune/unstr/Makefile
View File

@ -3,7 +3,7 @@
PROG= unstr PROG= unstr
NO_MAN= NO_MAN=
WARNS?= 3 WARNS?= 6
CFLAGS+= -I${.CURDIR}/../strfile CFLAGS+= -I${.CURDIR}/../strfile
.include <bsd.prog.mk> .include <bsd.prog.mk>

37
games/fortune/unstr/unstr.c
View File

@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
# include <sys/endian.h> # include <sys/endian.h>
# include <stdio.h> # include <stdio.h>
# include <ctype.h> # include <ctype.h>
# include <err.h>
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
# include "strfile.h" # include "strfile.h"
@ -75,32 +76,32 @@ char *Infile, /* name of input file */
FILE *Inf, *Dataf; FILE *Inf, *Dataf;
void getargs(char *[]), order_unstr(STRFILE *); void order_unstr(STRFILE *);
/* ARGSUSED */ /* ARGSUSED */
int main(int ac, char **av) int main(int ac, char **av)
{ {
static STRFILE tbl; /* description table */ static STRFILE tbl; /* description table */
getargs(av); if (ac != 2) {
if ((Inf = fopen(Infile, "r")) == NULL) { (void)fprintf(stderr, "usage: unstr datafile\n");
perror(Infile);
exit(1);
}
if ((Dataf = fopen(Datafile, "r")) == NULL) {
perror(Datafile);
exit(1); exit(1);
} }
Infile = av[1];
(void) strcpy(Datafile, Infile);
(void) strcat(Datafile, ".dat");
if ((Inf = fopen(Infile, "r")) == NULL)
err(1, "%s", Infile);
if ((Dataf = fopen(Datafile, "r")) == NULL)
err(1, "%s", Datafile);
(void) fread((char *) &tbl, sizeof tbl, 1, Dataf); (void) fread((char *) &tbl, sizeof tbl, 1, Dataf);
tbl.str_version = be32toh(tbl.str_version); tbl.str_version = be32toh(tbl.str_version);
tbl.str_numstr = be32toh(tbl.str_numstr); tbl.str_numstr = be32toh(tbl.str_numstr);
tbl.str_longlen = be32toh(tbl.str_longlen); tbl.str_longlen = be32toh(tbl.str_longlen);
tbl.str_shortlen = be32toh(tbl.str_shortlen); tbl.str_shortlen = be32toh(tbl.str_shortlen);
tbl.str_flags = be32toh(tbl.str_flags); tbl.str_flags = be32toh(tbl.str_flags);
if (!(tbl.str_flags & (STR_ORDERED | STR_RANDOM))) { if (!(tbl.str_flags & (STR_ORDERED | STR_RANDOM)))
fprintf(stderr, "nothing to do -- table in file order\n"); errx(1, "nothing to do -- table in file order");
exit(1);
}
Delimch = tbl.str_delim; Delimch = tbl.str_delim;
order_unstr(&tbl); order_unstr(&tbl);
(void) fclose(Inf); (void) fclose(Inf);
@ -108,18 +109,6 @@ int main(int ac, char **av)
exit(0); exit(0);
} }
void getargs(av)
char *av[];
{
if (!*++av) {
(void) fprintf(stderr, "usage: unstr datafile\n");
exit(1);
}
Infile = *av;
(void) strcpy(Datafile, Infile);
(void) strcat(Datafile, ".dat");
}
void order_unstr(tbl) void order_unstr(tbl)
STRFILE *tbl; STRFILE *tbl;
{ {