Module Name: src
Committed By: dholland
Date: Fri Aug 26 06:18:18 UTC 2011
Modified Files:
src/games/backgammon/common_source: back.h save.c
src/games/backgammon/teachgammon: tutor.h
src/games/battlestar: extern.h
src/games/boggle/boggle: bog.c
src/games/cribbage: cribbage.h
src/games/hack: extern.h
src/games/hangman: hangman.h
src/games/larn: extern.h
src/games/mille: mille.h
src/games/rogue: inventory.c rogue.h score.c
src/games/sail: extern.h pl_7.c
Log Message:
Use __dead and __printflike instead of __attribute__.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/games/backgammon/common_source/back.h
cvs rdiff -u -r1.13 -r1.14 src/games/backgammon/common_source/save.c
cvs rdiff -u -r1.9 -r1.10 src/games/backgammon/teachgammon/tutor.h
cvs rdiff -u -r1.32 -r1.33 src/games/battlestar/extern.h
cvs rdiff -u -r1.26 -r1.27 src/games/boggle/boggle/bog.c
cvs rdiff -u -r1.15 -r1.16 src/games/cribbage/cribbage.h
cvs rdiff -u -r1.16 -r1.17 src/games/hack/extern.h
cvs rdiff -u -r1.13 -r1.14 src/games/hangman/hangman.h
cvs rdiff -u -r1.14 -r1.15 src/games/larn/extern.h
cvs rdiff -u -r1.18 -r1.19 src/games/mille/mille.h
cvs rdiff -u -r1.14 -r1.15 src/games/rogue/inventory.c
cvs rdiff -u -r1.21 -r1.22 src/games/rogue/rogue.h
cvs rdiff -u -r1.15 -r1.16 src/games/rogue/score.c
cvs rdiff -u -r1.36 -r1.37 src/games/sail/extern.h
cvs rdiff -u -r1.41 -r1.42 src/games/sail/pl_7.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/common_source/back.h
diff -u src/games/backgammon/common_source/back.h:1.17 src/games/backgammon/common_source/back.h:1.18
--- src/games/backgammon/common_source/back.h:1.17 Mon Mar 22 05:10:19 2010
+++ src/games/backgammon/common_source/back.h Fri Aug 26 06:18:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: back.h,v 1.17 2010/03/22 05:10:19 mrg Exp $ */
+/* $NetBSD: back.h,v 1.18 2011/08/26 06:18:16 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -139,14 +139,14 @@
void cline(void);
int count(void);
void curmove(int, int);
-void errexit(const char *) __attribute__((__noreturn__));
+void errexit(const char *) __dead;
void fancyc(int);
void fboard(void);
void fixtty(struct termios *);
void getarg(char ***);
int getcaps(const char *);
void getmove(void);
-void getout(int) __attribute__((__noreturn__));
+void getout(int) __dead;
void gwrite(void);
void init(void);
int main(int, char *[]);
Index: src/games/backgammon/common_source/save.c
diff -u src/games/backgammon/common_source/save.c:1.13 src/games/backgammon/common_source/save.c:1.14
--- src/games/backgammon/common_source/save.c:1.13 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/common_source/save.c Fri Aug 26 06:18:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: save.c,v 1.13 2009/08/12 05:17:57 dholland Exp $ */
+/* $NetBSD: save.c,v 1.14 2011/08/26 06:18:16 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: save.c,v 1.13 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: save.c,v 1.14 2011/08/26 06:18:16 dholland Exp $");
#endif
#endif /* not lint */
@@ -53,7 +53,7 @@
static const char rec[] = "\" to recover your game.\n\n";
static const char cantrec[] = "Can't recover file: ";
-static void norec(const char *) __attribute__((__noreturn__));
+static void norec(const char *) __dead;
void
save(int n)
Index: src/games/backgammon/teachgammon/tutor.h
diff -u src/games/backgammon/teachgammon/tutor.h:1.9 src/games/backgammon/teachgammon/tutor.h:1.10
--- src/games/backgammon/teachgammon/tutor.h:1.9 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/teachgammon/tutor.h Fri Aug 26 06:18:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tutor.h,v 1.9 2009/08/12 05:17:57 dholland Exp $ */
+/* $NetBSD: tutor.h,v 1.10 2011/08/26 06:18:16 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -62,5 +62,5 @@
extern const struct situatn test[];
-void leave(void) __attribute__((__noreturn__));
-void tutor(void) __attribute__((__noreturn__));
+void leave(void) __dead;
+void tutor(void) __dead;
Index: src/games/battlestar/extern.h
diff -u src/games/battlestar/extern.h:1.32 src/games/battlestar/extern.h:1.33
--- src/games/battlestar/extern.h:1.32 Wed Aug 12 05:20:38 2009
+++ src/games/battlestar/extern.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.32 2009/08/12 05:20:38 dholland Exp $ */
+/* $NetBSD: extern.h,v 1.33 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -333,8 +333,8 @@
void chime(void);
void crash(void);
int cypher(void);
-void die(void) __attribute__((__noreturn__));
-void diesig(int) __attribute__((__noreturn__));
+void die(void) __dead;
+void diesig(int) __dead;
void dig(void);
void dooropen(void);
int draw(void);
@@ -353,7 +353,7 @@
int land(void);
int launch(void);
void light(void);
-void live(void) __attribute__((__noreturn__));
+void live(void) __dead;
void love(void);
int moveplayer(int, int);
void murder(void);
Index: src/games/boggle/boggle/bog.c
diff -u src/games/boggle/boggle/bog.c:1.26 src/games/boggle/boggle/bog.c:1.27
--- src/games/boggle/boggle/bog.c:1.26 Sun Dec 5 04:34:22 2010
+++ src/games/boggle/boggle/bog.c Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bog.c,v 1.26 2010/12/05 04:34:22 pgoyette Exp $ */
+/* $NetBSD: bog.c,v 1.27 2011/08/26 06:18:17 dholland Exp $ */
/*-
* Copyright (c) 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: bog.c,v 1.26 2010/12/05 04:34:22 pgoyette Exp $");
+__RCSID("$NetBSD: bog.c,v 1.27 2011/08/26 06:18:17 dholland Exp $");
#endif
#endif /* not lint */
@@ -64,7 +64,7 @@
static void checkdict(void);
static void newgame(const char *);
static int compar(const void *, const void *);
-static void usage(void) __attribute__((__noreturn__));
+static void usage(void) __dead;
struct dictindex dictindex[26];
Index: src/games/cribbage/cribbage.h
diff -u src/games/cribbage/cribbage.h:1.15 src/games/cribbage/cribbage.h:1.16
--- src/games/cribbage/cribbage.h:1.15 Wed Aug 12 05:48:04 2009
+++ src/games/cribbage/cribbage.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cribbage.h,v 1.15 2009/08/12 05:48:04 dholland Exp $ */
+/* $NetBSD: cribbage.h,v 1.16 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -56,8 +56,7 @@
extern char explan[]; /* string for explanation */
-void addmsg(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void addmsg(const char *, ...) __printflike(1, 2);
int adjust(const CARD [], CARD);
int anymove(const CARD [], int, int);
void bye(void);
@@ -75,15 +74,14 @@
int is_one(CARD, const CARD [], int);
void makedeck(CARD []);
void makeknown(const CARD [], int);
-void msg(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void msg(const char *, ...) __printflike(1, 2);
int msgcard(CARD, BOOLEAN);
int number(int, int, const char *);
int pegscore(CARD, const CARD [], int, int);
int plyrhand(const CARD [], const char *);
void prcard(WINDOW *, int, int, CARD, BOOLEAN);
void prhand(const CARD [], int, WINDOW *, BOOLEAN);
-void receive_intr(int) __attribute__((__noreturn__));
+void receive_intr(int) __dead;
int scorehand(const CARD [], CARD, int, BOOLEAN, BOOLEAN);
void shuffle(CARD []);
void sorthand(CARD [], int);
Index: src/games/hack/extern.h
diff -u src/games/hack/extern.h:1.16 src/games/hack/extern.h:1.17
--- src/games/hack/extern.h:1.16 Sat Aug 6 20:18:26 2011
+++ src/games/hack/extern.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.16 2011/08/06 20:18:26 dholland Exp $ */
+/* $NetBSD: extern.h,v 1.17 2011/08/26 06:18:17 dholland Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@
void done_in_by(struct monst *);
void done(const char *);
void clearlocks(void);
-void hang_up(int) __attribute__((__noreturn__));
+void hang_up(int) __dead;
char *eos(char *);
void charcat(char *, int);
void prscore(int, char **);
@@ -208,8 +208,7 @@
/* hack.main.c */
void glo(int);
void askname(void);
-void impossible(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void impossible(const char *, ...) __printflike(1, 2);
void stop_occupation(void);
/* hack.makemon.c */
@@ -312,13 +311,12 @@
/* hack.pri.c */
void swallowed(void);
-void panic(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void panic(const char *, ...) __printflike(1, 2);
void atl(int, int, int);
void on_scr(int, int);
void tmp_at(schar, schar);
void Tmp_at(schar, schar);
-void setclipped(void) __attribute__((__noreturn__));
+void setclipped(void) __dead;
void at(xchar, xchar, int);
void prme(void);
int doredraw(void);
@@ -423,10 +421,8 @@
void more(void);
void cmore(const char *);
void clrlin(void);
-void pline(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
-void vpline(const char *, va_list)
- __attribute__((__format__(__printf__, 1, 0)));
+void pline(const char *, ...) __printflike(1, 2);
+void vpline(const char *, va_list) __printflike(1, 0);
void putsym(int);
void putstr(const char *);
@@ -453,15 +449,14 @@
void gettty(void);
void settty(const char *);
void setftty(void);
-void error(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2),__noreturn__));
+void error(const char *, ...) __printflike(1, 2);
void getlin(char *);
void getret(void);
void cgetret(const char *);
void xwaitforspace(const char *);
char *parse(void);
char readchar(void);
-void end_of_input(void) __attribute__((__noreturn__));
+void end_of_input(void) __dead;
/* hack.u_init.c */
void u_init(void);
Index: src/games/hangman/hangman.h
diff -u src/games/hangman/hangman.h:1.13 src/games/hangman/hangman.h:1.14
--- src/games/hangman/hangman.h:1.13 Tue Jan 27 20:30:29 2004
+++ src/games/hangman/hangman.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hangman.h,v 1.13 2004/01/27 20:30:29 jsm Exp $ */
+/* $NetBSD: hangman.h,v 1.14 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -81,7 +81,7 @@
extern off_t Dict_size;
-void die(int) __attribute__((__noreturn__));
+void die(int) __dead;
void endgame(void);
int main(int, char *[]);
void getguess(void);
Index: src/games/larn/extern.h
diff -u src/games/larn/extern.h:1.14 src/games/larn/extern.h:1.15
--- src/games/larn/extern.h:1.14 Wed Oct 21 01:07:45 2009
+++ src/games/larn/extern.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.14 2009/10/21 01:07:45 snj Exp $ */
+/* $NetBSD: extern.h,v 1.15 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -116,7 +116,7 @@
void scbr(void);
void sncbr(void);
void newgame(void);
-void lprintf(const char *, ...) __attribute__((__format__(__printf__, 1, 2)));
+void lprintf(const char *, ...) __printflike(1, 2);
void lprint(long);
void lwrite(char *, int);
long lgetc(void);
Index: src/games/mille/mille.h
diff -u src/games/mille/mille.h:1.18 src/games/mille/mille.h:1.19
--- src/games/mille/mille.h:1.18 Tue Aug 16 11:14:04 2011
+++ src/games/mille/mille.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mille.h,v 1.18 2011/08/16 11:14:04 christos Exp $ */
+/* $NetBSD: mille.h,v 1.19 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -237,9 +237,9 @@
int canplay(const PLAY *, const PLAY *, CARD);
int check_ext(bool);
void check_more(void);
-void die(int) __attribute__((__noreturn__));
+void die(int) __dead;
void domove(void);
-bool error(const char *, ...);
+bool error(const char *, ...) __printflike(1,2);
void extrapolate(PLAY *);
void finalscore(PLAY *);
CARD getcard(void);
Index: src/games/rogue/inventory.c
diff -u src/games/rogue/inventory.c:1.14 src/games/rogue/inventory.c:1.15
--- src/games/rogue/inventory.c:1.14 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/inventory.c Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: inventory.c,v 1.14 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: inventory.c,v 1.15 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)inventory.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: inventory.c,v 1.14 2009/08/12 08:44:45 dholland Exp $");
+__RCSID("$NetBSD: inventory.c,v 1.15 2011/08/26 06:18:17 dholland Exp $");
#endif
#endif /* not lint */
@@ -470,8 +470,7 @@
static void sbuf_init(struct sbuf *s, char *buf, size_t maxlen);
static void sbuf_addstr(struct sbuf *s, const char *str);
-static void sbuf_addf(struct sbuf *s, const char *fmt, ...)
- __attribute__((__format__(__printf__, 2, 3)));
+static void sbuf_addf(struct sbuf *s, const char *fmt, ...) __printflike(2,3);
static void desc_count(struct sbuf *s, int n);
static void desc_called(struct sbuf *s, const object *);
Index: src/games/rogue/rogue.h
diff -u src/games/rogue/rogue.h:1.21 src/games/rogue/rogue.h:1.22
--- src/games/rogue/rogue.h:1.21 Mon May 23 23:01:17 2011
+++ src/games/rogue/rogue.h Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rogue.h,v 1.21 2011/05/23 23:01:17 joerg Exp $ */
+/* $NetBSD: rogue.h,v 1.22 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -466,7 +466,7 @@
boolean check_imitator(object *);
void check_message(void);
int check_up(void);
-void clean_up(const char *) __attribute__((__noreturn__));
+void clean_up(const char *) __dead;
void clear_level(void);
void cnfs(void);
int coin_toss(void);
@@ -483,7 +483,7 @@
int drop_check(void);
void eat(void);
void edit_opts(void);
-void error_save(int) __attribute__((__noreturn__));
+void error_save(int) __dead;
void fight(boolean);
boolean flame_broil(object *);
void free_object(object *);
@@ -526,7 +526,7 @@
boolean is_passable(int, int);
boolean is_vowel(short);
void kick_into_pack(void);
-void killed_by(const object *, short) __attribute__((__noreturn__));
+void killed_by(const object *, short) __dead;
long lget_number(const char *);
void light_passage(int, int);
void light_up_room(int);
@@ -534,7 +534,7 @@
void make_level(void);
void make_scroll_titles(void);
boolean md_df(const char *);
-void md_exit(int) __attribute__((__noreturn__));
+void md_exit(int) __dead;
void md_gct(struct rogue_time *);
int md_get_file_id(const char *);
void md_gfmt(const char *, struct rogue_time *);
@@ -547,8 +547,7 @@
void md_sleep(int);
void md_slurp(void);
/*void message(const char *, boolean);*/
-void messagef(boolean, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
+void messagef(boolean, const char *, ...) __printflike(2, 3);
void mix_colors(void);
int mon_can_go(const object *, short, short);
int mon_damage(object *, short);
@@ -577,7 +576,7 @@
void put_objects(void);
void put_on_ring(void);
void put_player(short);
-void put_scores(const object *, short) __attribute__((__noreturn__));
+void put_scores(const object *, short) __dead;
void put_stairs(void);
void quaff(void);
void quit(boolean);
@@ -631,7 +630,7 @@
void wanderer(void);
void wear(void);
void wield(void);
-void win(void) __attribute__((__noreturn__));
+void win(void) __dead;
void wizardize(void);
long xxx(boolean);
void xxxx(char *, short);
Index: src/games/rogue/score.c
diff -u src/games/rogue/score.c:1.15 src/games/rogue/score.c:1.16
--- src/games/rogue/score.c:1.15 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/score.c Fri Aug 26 06:18:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: score.c,v 1.15 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: score.c,v 1.16 2011/08/26 06:18:17 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: score.c,v 1.15 2009/08/12 08:44:45 dholland Exp $");
+__RCSID("$NetBSD: score.c,v 1.16 2011/08/26 06:18:17 dholland Exp $");
#endif
#endif /* not lint */
@@ -61,7 +61,7 @@
static int get_value(const object *);
static void id_all(void);
static void sell_pack(void);
-static void sf_error(void) __attribute__((__noreturn__));
+static void sf_error(void) __dead;
void
killed_by(const object *monster, short other)
Index: src/games/sail/extern.h
diff -u src/games/sail/extern.h:1.36 src/games/sail/extern.h:1.37
--- src/games/sail/extern.h:1.36 Fri Aug 6 09:14:40 2010
+++ src/games/sail/extern.h Fri Aug 26 06:18:18 2011
@@ -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 @@
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 @@
/* 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 @@
/* 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);
Index: src/games/sail/pl_7.c
diff -u src/games/sail/pl_7.c:1.41 src/games/sail/pl_7.c:1.42
--- src/games/sail/pl_7.c:1.41 Thu Aug 25 16:18:28 2011
+++ src/games/sail/pl_7.c Fri Aug 26 06:18:18 2011
@@ -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 @@
/*
* 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 @@
/*
* 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;
