diff options
| author |   dholland <dholland@NetBSD.org> | 2011-08-26 06:18:16 +0000 |
|---|---|---|
| committer | dholland <dholland@NetBSD.org> | 2011-08-26 06:18:16 +0000 |
| commit | 9e7fd816e02e66962d482b02209f112e1d5789fc (patch) | |
| tree | a17f6ea5c647e0ec62bfe7ecad4192e0335b121b /sail | |
| parent | 9969175ad6caac230e2fee18f6f64f2be17a1fa6 (diff) | |
| download | bsdgames-darwin-9e7fd816e02e66962d482b02209f112e1d5789fc.tar.gz bsdgames-darwin-9e7fd816e02e66962d482b02209f112e1d5789fc.tar.zst bsdgames-darwin-9e7fd816e02e66962d482b02209f112e1d5789fc.zip | |
Use __dead and __printflike instead of __attribute__.
Diffstat (limited to 'sail')
| -rw-r--r-- | sail/extern.h | 19 | ||||
| -rw-r--r-- | sail/pl_7.c | 8 |
2 files changed, 12 insertions, 15 deletions
diff --git a/sail/extern.h b/sail/extern.h index f4509b29..dd477ea7 100644 --- a/sail/extern.h +++ b/sail/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.36 2010/08/06 09:14:40 dholland Exp $ */ +/* $NetBSD: extern.h,v 1.37 2011/08/26 06:18:18 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -313,13 +313,13 @@ int boarding(struct ship *, int); void unboard(struct ship *, struct ship *, int); /* pl_1.c */ -void leave(int) __attribute__((__noreturn__)); -void choke(int) __attribute__((__noreturn__)); +void leave(int) __dead; +void choke(int) __dead; void child(int); /* pl_2.c */ void newturn(int); -void play(void) __attribute__((__noreturn__)); +void play(void) __dead; /* pl_3.c */ void acceptcombat(void); @@ -344,10 +344,8 @@ void loadplayer(void); /* pl_7.c */ void initscreen(void); void cleanupscreen(void); -void Signal(const char *, struct ship *, ...) - __attribute__((__format__(__printf__,1,3))); -void Msg(const char *, ...) - __attribute__((__format__(__printf__,1,2))); +void Signal(const char *, struct ship *, ...) __printflike(1,3); +void Msg(const char *, ...) __printflike(1,2); int sgetch(const char *, struct ship *, int); void sgetstr(const char *, char *, int); void centerview(void); @@ -365,9 +363,8 @@ void pl_main(void); /* sync.c */ void fmtship(char *, size_t, const char *, struct ship *); void makesignal(struct ship *, const char *, struct ship *, ...) - __attribute__((__format__(__printf__,2,4))); -void makemsg(struct ship *, const char *, ...) - __attribute__((__format__(__printf__,2,3))); + __printflike(2,4); +void makemsg(struct ship *, const char *, ...) __printflike(2, 3); int sync_exists(int); int sync_open(void); void sync_close(int); diff --git a/sail/pl_7.c b/sail/pl_7.c index 56e33ba2..a1ad8787 100644 --- a/sail/pl_7.c +++ b/sail/pl_7.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_7.c,v 1.41 2011/08/25 16:18:28 christos Exp $ */ +/* $NetBSD: pl_7.c,v 1.42 2011/08/26 06:18:18 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_7.c,v 1.41 2011/08/25 16:18:28 christos Exp $"); +__RCSID("$NetBSD: pl_7.c,v 1.42 2011/08/26 06:18:18 dholland Exp $"); #endif #endif /* not lint */ @@ -238,7 +238,7 @@ mvaddselstr(int y, int x0, int item, int curitem, /* * Likewise but a printf. */ -static void __attribute__((__format__(__printf__, 6, 7))) +static void __printflike(6, 7) mvselprintw(int y, int x0, int item, int curitem, size_t width, const char *fmt, ...) { @@ -296,7 +296,7 @@ down(int *posp, int *scrollp, int max, int visible) /* * Complain briefly. */ -static void __attribute__((__format__(__printf__, 3, 4))) +static void __printflike(3, 4) oops(int y, int x, const char *fmt, ...) { int oy, ox; |