diff options
author | charnier <charnier@FreeBSD.org> | 2002-08-25 13:10:45 +0000 |
---|---|---|
committer | charnier <charnier@FreeBSD.org> | 2002-08-25 13:10:45 +0000 |
commit | 4966efff7bc9071f04706819e62e1a291d22bcb2 (patch) | |
tree | b72048b5daaf9c3f63615a383f3610277e497ede /games | |
parent | c88222c6c0149f22317404fa4c67eba023d90206 (diff) | |
download | FreeBSD-src-4966efff7bc9071f04706819e62e1a291d22bcb2.zip FreeBSD-src-4966efff7bc9071f04706819e62e1a291d22bcb2.tar.gz |
Replace various spelling with FALLTHROUGH which is lint()able
Diffstat (limited to 'games')
-rw-r--r-- | games/hack/hack.apply.c | 6 | ||||
-rw-r--r-- | games/hack/hack.c | 6 | ||||
-rw-r--r-- | games/hack/hack.do_name.c | 6 | ||||
-rw-r--r-- | games/hack/hack.dog.c | 8 | ||||
-rw-r--r-- | games/hack/hack.eat.c | 12 | ||||
-rw-r--r-- | games/hack/hack.mkobj.c | 6 | ||||
-rw-r--r-- | games/hack/hack.objnam.c | 10 | ||||
-rw-r--r-- | games/hack/hack.trap.c | 6 | ||||
-rw-r--r-- | games/hack/hack.wizard.c | 6 | ||||
-rw-r--r-- | games/phantasia/fight.c | 4 | ||||
-rw-r--r-- | games/phantasia/misc.c | 2 |
11 files changed, 45 insertions, 27 deletions
diff --git a/games/hack/hack.apply.c b/games/hack/hack.apply.c index a63bc40..0de483d 100644 --- a/games/hack/hack.apply.c +++ b/games/hack/hack.apply.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.apply.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" #include "def.edog.h" @@ -37,7 +39,7 @@ doapply() { use_magic_whistle(obj); break; } - /* fall into next case */ + /* FALLTHROUGH */ case WHISTLE: use_whistle(obj); break; diff --git a/games/hack/hack.c b/games/hack/hack.c index f1e1c28..5a27204 100644 --- a/games/hack/hack.c +++ b/games/hack/hack.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" #include <stdio.h> @@ -496,7 +498,7 @@ struct monst *mtmp; case '+': if(x != u.ux && y != u.uy) break; if(flags.run != 1) goto stop; - /* fall into next case */ + /* FALLTHROUGH */ case CORR_SYM: corr: if(flags.run == 1 || flags.run == 3) { diff --git a/games/hack/hack.do_name.c b/games/hack/hack.do_name.c index add0b8a..24dce8a 100644 --- a/games/hack/hack.do_name.c +++ b/games/hack/hack.do_name.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.do_name.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" #include <stdio.h> @@ -209,7 +211,7 @@ extern char *shkname(); (void) strcpy(buf, shkname(mtmp)); break; } - /* fall into next case */ + /* FALLTHROUGH */ default: (void) sprintf(buf, "the %s%s", mtmp->minvis ? "invisible " : "", diff --git a/games/hack/hack.dog.c b/games/hack/hack.dog.c index 600ff6d..6272a18 100644 --- a/games/hack/hack.dog.c +++ b/games/hack/hack.dog.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.dog.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" #include "hack.mfndpos.h" @@ -96,7 +98,7 @@ dogfood(obj) struct obj *obj; { ); default: if(!obj->cursed) return(APPORT); - /* fall into next case */ + /* FALLTHROUGH */ case BALL_SYM: case CHAIN_SYM: case ROCK_SYM: @@ -180,7 +182,7 @@ int info[9]; /* first we look for food */ gtyp = UNDEF; /* no goal as yet */ -#ifdef LINT +#ifdef lint gx = gy = 0; /* suppress 'used before set' message */ #endif /* LINT */ for(obj = fobj; obj; obj = obj->nobj) { diff --git a/games/hack/hack.eat.c b/games/hack/hack.eat.c index c410ea1..6f4116b 100644 --- a/games/hack/hack.eat.c +++ b/games/hack/hack.eat.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.eat.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" char POISONOUS[] = "ADKSVabhks"; @@ -394,11 +396,11 @@ int tp = 0; case 'n': u.uhp = u.uhpmax; flags.botl = 1; - /* fall into next case */ + /* FALLTHROUGH */ case '@': pline("You cannibal! You will be sorry for this!"); /* not tp++; */ - /* fall into next case */ + /* FALLTHROUGH */ case 'd': Aggravate_monster |= INTRINSIC; break; @@ -411,12 +413,12 @@ int tp = 0; Invis |= INTRINSIC; See_invisible |= INTRINSIC; } - /* fall into next case */ + /* FALLTHROUGH */ case 'y': #ifdef QUEST u.uhorizon++; #endif /* QUEST */ - /* fall into next case */ + /* FALLTHROUGH */ case 'B': Confusion = 50; break; diff --git a/games/hack/hack.mkobj.c b/games/hack/hack.mkobj.c index cc8ce6d..7ef1540 100644 --- a/games/hack/hack.mkobj.c +++ b/games/hack/hack.mkobj.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.mkobj.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" @@ -76,7 +78,7 @@ int otyp; if(otmp->otyp == TIN) otmp->spe = rnd(...); #endif /* NOT_YET_IMPLEMENTED */ - /* fall into next case */ + /* FALLTHROUGH */ case GEM_SYM: otmp->quan = rn2(6) ? 1 : 2; case TOOL_SYM: diff --git a/games/hack/hack.objnam.c b/games/hack/hack.objnam.c index eebc052..add63a2 100644 --- a/games/hack/hack.objnam.c +++ b/games/hack/hack.objnam.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.objnam.c - version 1.0.2 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" #define Sprintf (void) sprintf @@ -112,7 +114,7 @@ int pl = (obj->quan != 1); break; } /* fungis ? */ - /* fall into next case */ + /* FALLTHROUGH */ case WEAPON_SYM: if(obj->otyp == WORM_TOOTH && pl) { pl = 0; @@ -124,7 +126,7 @@ int pl = (obj->quan != 1); Strcpy(buf, "crysknives"); break; } - /* fall into next case */ + /* FALLTHROUGH */ case ARMOR_SYM: case CHAIN_SYM: case ROCK_SYM: @@ -258,7 +260,7 @@ char *bp = xname(obj); case ARMOR_SYM: if(obj->owornmask & W_ARMOR) Strcat(bp, " (being worn)"); - /* fall into next case */ + /* FALLTHROUGH */ case WEAPON_SYM: if(obj->known) { Strcat(prefix, sitoa(obj->spe)); diff --git a/games/hack/hack.trap.c b/games/hack/hack.trap.c index 682e961..9d10098 100644 --- a/games/hack/hack.trap.c +++ b/games/hack/hack.trap.c @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.trap.c - version 1.0.3 */ -/* $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "hack.h" @@ -256,7 +258,7 @@ float_down(){ break; case TRAPDOOR: if(!xdnstair || u.ustuck) break; - /* fall into next case */ + /* FALLTHROUGH */ default: dotrap(trap); } diff --git a/games/hack/hack.wizard.c b/games/hack/hack.wizard.c index f4a4712..2065475 100644 --- a/games/hack/hack.wizard.c +++ b/games/hack/hack.wizard.c @@ -1,9 +1,11 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.wizard.c - version 1.0.3 */ -/* $FreeBSD$ */ /* wizard code - inspired by rogue code from Merlyn Leroy (digi-g!brian) */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "hack.h" extern struct permonst pm_wizard; extern struct monst *makemon(); @@ -137,7 +139,7 @@ struct monst *mtmp; case 1: pline("\"Destroy the thief, my pets!\""); aggravate(); /* aggravate all the monsters */ - /* fall into next case */ + /* FALLTHROUGH */ case 2: if (flags.no_of_wizards == 1 && rnd(5) == 0) /* if only 1 wizard, clone himself */ diff --git a/games/phantasia/fight.c b/games/phantasia/fight.c index ae778d4..030b29b 100644 --- a/games/phantasia/fight.c +++ b/games/phantasia/fight.c @@ -1549,7 +1549,7 @@ double dtemp; /* for temporary calculations */ } } /* end treasure types 10 - 13 */ - /* fall through to treasure type 9 if no treasure from above */ + /* FALLTHROUGH to treasure type 9 if no treasure from above */ case 9: /* treasure type 9 */ switch (whichtreasure) @@ -1563,7 +1563,7 @@ double dtemp; /* for temporary calculations */ ++Player.p_crowns; break; } - /* fall through otherwise */ + /* FALLTHROUGH */ case 2: addstr("You've been blessed!\n"); diff --git a/games/phantasia/misc.c b/games/phantasia/misc.c index f46e3fd..c103e08 100644 --- a/games/phantasia/misc.c +++ b/games/phantasia/misc.c @@ -1114,7 +1114,7 @@ int operation; case A_NEAR: /* pick random coordinates near */ xnew = Player.p_x + ROLL(1.0, 5.0); ynew = Player.p_y - ROLL(1.0, 5.0); - /* fall through for check */ + /* FALLTHROUGH for check */ case A_SPECIFIC: /* just move player */ if (Beyond && fabs(xnew) < D_BEYOND && fabs(ynew) < D_BEYOND) |