Module Name: src Committed By: joerg Date: Mon Aug 29 20:37:43 UTC 2011
Modified Files: src/usr.sbin/mtree: extern.h mtree.c Log Message: Use __dead and __printflike To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/mtree/extern.h cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/mtree/mtree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/mtree/extern.h diff -u src/usr.sbin/mtree/extern.h:1.31 src/usr.sbin/mtree/extern.h:1.32 --- src/usr.sbin/mtree/extern.h:1.31 Wed Apr 8 19:03:13 2009 +++ src/usr.sbin/mtree/extern.h Mon Aug 29 20:37:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.31 2009/04/08 19:03:13 apb Exp $ */ +/* $NetBSD: extern.h,v 1.32 2011/08/29 20:37:43 joerg Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -60,8 +60,7 @@ void dump_nodes(const char *, NODE *, int); void init_excludes(void); int matchtags(NODE *); -void mtree_err(const char *, ...) - __attribute__((__format__(__printf__, 1, 2))); +__dead __printflike(1,2) void mtree_err(const char *, ...); const char *nodetype(u_int); u_int parsekey(const char *, int *); void parsetags(slist_t *, char *); Index: src/usr.sbin/mtree/mtree.c diff -u src/usr.sbin/mtree/mtree.c:1.36 src/usr.sbin/mtree/mtree.c:1.37 --- src/usr.sbin/mtree/mtree.c:1.36 Wed Apr 8 19:43:05 2009 +++ src/usr.sbin/mtree/mtree.c Mon Aug 29 20:37:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.36 2009/04/08 19:43:05 wiz Exp $ */ +/* $NetBSD: mtree.c,v 1.37 2011/08/29 20:37:43 joerg Exp $ */ /*- * Copyright (c) 1989, 1990, 1993 @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: mtree.c,v 1.36 2009/04/08 19:43:05 wiz Exp $"); +__RCSID("$NetBSD: mtree.c,v 1.37 2011/08/29 20:37:43 joerg Exp $"); #endif #endif /* not lint */ @@ -63,8 +63,7 @@ rflag, sflag, tflag, uflag, Uflag; char fullpath[MAXPATHLEN]; - int main(int, char **); -static void usage(void); +__dead static void usage(void); int main(int argc, char **argv)