Module Name: src Committed By: joerg Date: Tue Sep 6 18:28:18 UTC 2011
Modified Files: src/usr.bin/rdist: defs.h main.c Log Message: Use __dead and __printflike. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/rdist/defs.h cvs rdiff -u -r1.19 -r1.20 src/usr.bin/rdist/main.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.bin/rdist/defs.h diff -u src/usr.bin/rdist/defs.h:1.18 src/usr.bin/rdist/defs.h:1.19 --- src/usr.bin/rdist/defs.h:1.18 Mon Apr 13 04:35:36 2009 +++ src/usr.bin/rdist/defs.h Tue Sep 6 18:28:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.18 2009/04/13 04:35:36 lukem Exp $ */ +/* $NetBSD: defs.h,v 1.19 2011/09/06 18:28:18 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -151,26 +151,23 @@ int any(int, const char *); char *colon(char *); -void cleanup(int); +void cleanup(int) __dead; void define(char *); void docmds(char **, int, char **); -void error(const char *, ...) - __attribute__((__format__(__printf__, 1, 2))) ; +void error(const char *, ...) __printflike(1, 2); int except(char *); struct namelist * expand(struct namelist *, int); char *exptilde(char [], char *); -void fatal(const char *, ...) - __attribute__((__format__(__printf__, 1, 2))); +void fatal(const char *, ...) __printflike(1, 2); int inlist(struct namelist *, char *); void insert(char *, struct namelist *, struct namelist *, struct subcmd *); void install(char *, char *, int, int); -void dolog(FILE *, const char *, ...) - __attribute__((__format__(__printf__, 2, 3))); +void dolog(FILE *, const char *, ...) __printflike(2, 3); struct namelist * lookup(char *, int, struct namelist *); -void lostconn(int); +void lostconn(int) __dead; struct namelist * makenl(char *); void freenl(struct namelist *); Index: src/usr.bin/rdist/main.c diff -u src/usr.bin/rdist/main.c:1.19 src/usr.bin/rdist/main.c:1.20 --- src/usr.bin/rdist/main.c:1.19 Mon Jul 21 14:19:25 2008 +++ src/usr.bin/rdist/main.c Tue Sep 6 18:28:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.19 2008/07/21 14:19:25 lukem Exp $ */ +/* $NetBSD: main.c,v 1.20 2011/09/06 18:28:18 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; #else -__RCSID("$NetBSD: main.c,v 1.19 2008/07/21 14:19:25 lukem Exp $"); +__RCSID("$NetBSD: main.c,v 1.20 2011/09/06 18:28:18 joerg Exp $"); #endif #endif /* not lint */ @@ -80,8 +80,7 @@ struct passwd *pw; /* pointer to static area used by getpwent */ struct group *gr; /* pointer to static area used by getgrent */ -int main(int, char **); -static void usage(void); +__dead static void usage(void); static void docmdargs(int, char *[]); int