From fa89c5605faa7ae6d16c35fc946e46a24e9d1efe Mon Sep 17 00:00:00 2001 From: delphij Date: Thu, 27 Jan 2005 14:44:39 +0000 Subject: WARNS?=6 cleanup for [gs]et[fp]mac: - Constify structure members that should not be changed during process. - Apply static where needed - signed/unsigned madness - Bump WARNS?= levels from 2 to 6 (this is a diff reduction for a subsequent commit against these Makefile's) --- usr.sbin/setfmac/Makefile | 2 +- usr.sbin/setfmac/setfmac.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.sbin/setfmac') diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile index bc3c21e..b4e2203 100644 --- a/usr.sbin/setfmac/Makefile +++ b/usr.sbin/setfmac/Makefile @@ -5,6 +5,6 @@ LINKS= ${BINDIR}/setfmac ${BINDIR}/setfsmac MAN= setfmac.8 setfsmac.8 SRCS= setfmac.c -WARNS?= 2 +WARNS?= 6 .include diff --git a/usr.sbin/setfmac/setfmac.c b/usr.sbin/setfmac/setfmac.c index d5f5a61..f382cb2 100644 --- a/usr.sbin/setfmac/setfmac.c +++ b/usr.sbin/setfmac/setfmac.c @@ -54,7 +54,7 @@ struct label_spec { regex_t regex; /* compiled regular expression to match */ char *regexstr; /* uncompiled regular expression */ mode_t mode; /* mode to possibly match */ - char *modestr; /* print-worthy ",-?" mode string */ + const char *modestr; /* print-worthy ",-?" mode string */ char *mactext; /* MAC label to apply */ int flags; /* miscellaneous flags */ #define F_DONTLABEL 0x01 @@ -195,13 +195,13 @@ usage(int is_setfmac) exit(1); } -int +static int chomp_line(char **line, size_t *linesize) { char *s; int freeme = 0; - for (s = *line; s - *line < *linesize; s++) { + for (s = *line; (unsigned)(s - *line) < *linesize; s++) { if (!isspace(*s)) break; } -- cgit v1.1