From: PatR Date: Sun, 31 Jul 2016 02:08:25 +0000 (-0700) Subject: lint suppression X-Git-Tag: NetHack-3.6.1_RC01~633 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2160dee4caa4446db4685ec9b32dcaadf588fc55;p=nethack lint suppression botl.c - unused argument in #if STATUS_HILITES code. mkmaze.c - "clang version 7.3.0 (clang-703.0.31)", or whatever version of gcc it's based on, warns that ''#define register /*empty*/'' hides a keyword. '-Wkeyword-macro' isn't mentioned in the recent gcc manual I checked, but it is being enabled by specifying '-pedantic' (rather than -Wall or -W) to the preprocessor. It could be turned off via '-Wno-keyword-macro' but this removes all mkmaze.c's register references instead. (Sean wanted that, and this might be why....) --- diff --git a/src/botl.c b/src/botl.c index fd1880cf5..8fc6ab521 100644 --- a/src/botl.c +++ b/src/botl.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 botl.c $NHDT-Date: 1452660188 2016/01/13 04:43:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */ +/* NetHack 3.6 botl.c $NHDT-Date: 1469930895 2016/07/31 02:08:15 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.75 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1311,17 +1311,18 @@ boolean from_configfile; /* Now finally, we notify the window port */ if (!from_configfile) status_threshold(idx, status_hilites[idx].anytype, - status_hilites[idx].threshold, - status_hilites[idx].behavior, - status_hilites[idx].coloridx[0], - status_hilites[idx].coloridx[1]); + status_hilites[idx].threshold, + status_hilites[idx].behavior, + status_hilites[idx].coloridx[0], + status_hilites[idx].coloridx[1]); return TRUE; } +/*ARGUSED*/ void status_notify_windowport(all) -boolean all; +boolean all UNUSED; { int idx; anything it; diff --git a/src/mkmaze.c b/src/mkmaze.c index b3dc88f3e..8497f1c7e 100644 --- a/src/mkmaze.c +++ b/src/mkmaze.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mkmaze.c $NHDT-Date: 1461571093 2016/04/25 07:58:13 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.47 $ */ +/* NetHack 3.6 mkmaze.c $NHDT-Date: 1469930897 2016/07/31 02:08:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.50 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -41,7 +41,7 @@ STATIC_OVL int iswall(x, y) int x, y; { - register int type; + int type; if (!isok(x, y)) return 0; @@ -126,7 +126,7 @@ wall_cleanup(x1, y1, x2, y2) int x1, y1, x2, y2; { uchar type; - register int x, y; + int x, y; struct rm *lev; /* sanity check on incoming variables */ @@ -158,7 +158,7 @@ fix_wall_spines(x1, y1, x2, y2) int x1, y1, x2, y2; { uchar type; - register int x,y; + int x, y; struct rm *lev; int FDECL((*loc_f), (int, int)); int bits; @@ -226,7 +226,7 @@ int x1, y1, x2, y2; STATIC_OVL boolean okay(x, y, dir) int x, y; -register int dir; +int dir; { mz_move(x, y, dir); mz_move(x, y, dir); @@ -460,9 +460,9 @@ static boolean was_waterlevel; /* ugh... this shouldn't be needed */ void fixup_special() { - register lev_region *r = lregions; + lev_region *r = lregions; struct d_level lev; - register int x, y; + int x, y; struct mkroom *croom; boolean added_branch = FALSE; @@ -600,7 +600,7 @@ fixup_special() create_secret_door(croom, W_ANY); } else if (on_level(&u.uz, &orcus_level)) { - register struct monst *mtmp, *mtmp2; + struct monst *mtmp, *mtmp2; /* it's a ghost town, get rid of shopkeepers */ for (mtmp = fmon; mtmp; mtmp = mtmp2) { @@ -620,7 +620,7 @@ fixup_special() void makemaz(s) -register const char *s; +const char *s; { int x, y; char protofile[20]; @@ -839,7 +839,7 @@ walkfrom(x, y, typ) int x, y; schar typ; { - register int q, a, dir; + int q, a, dir; int dirs[4]; if (!typ) { @@ -887,7 +887,8 @@ coord *cc; && levl[cc->x][cc->y].typ != (level.flags.corrmaze ? CORR : ROOM)); if (cpt >= 100) { - register int x, y; + int x, y; + /* last try */ for (x = 0; x < (x_maze_max >> 1) - 1; x++) for (y = 0; y < (y_maze_max >> 1) - 1; y++) { @@ -915,9 +916,9 @@ coord *cc; void bound_digging() { - register int x, y; - register unsigned typ; - register struct rm *lev; + int x, y; + unsigned typ; + struct rm *lev; boolean found, nonwall; int xmin, xmax, ymin, ymax; @@ -1024,8 +1025,10 @@ fumaroles() for (n = rn2(3) + 2; n; n--) { xchar x = rn1(COLNO - 4, 3); xchar y = rn1(ROWNO - 4, 3); + if (levl[x][y].typ == LAVAPOOL) { NhRegion *r = create_gas_cloud(x, y, 4 + rn2(5), rn1(10, 5)); + clear_heros_fault(r); snd = TRUE; if (distu(x, y) < 15) @@ -1043,11 +1046,6 @@ fumaroles() * other source files, but they are all so nicely encapsulated here. */ -#ifdef DEBUG -/* to ease the work of debuggers at this stage */ -#define register -#endif - #define CONS_OBJ 0 #define CONS_MON 1 #define CONS_HERO 2 @@ -1071,8 +1069,8 @@ void movebubbles() { static boolean up; - register struct bubble *b; - register int x, y, i, j; + struct bubble *b; + int x, y, i, j; struct trap *btrap; static const struct rm water_pos = { cmap_to_glyph(S_water), WATER, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -1194,7 +1192,7 @@ movebubbles() */ up = !up; for (b = up ? bbubbles : ebubbles; b; b = up ? b->next : b->prev) { - register int rx = rn2(3), ry = rn2(3); + int rx = rn2(3), ry = rn2(3); mv_bubble(b, b->dx + 1 - (!b->dx ? rx : (rx ? 1 : 0)), b->dy + 1 - (!b->dy ? ry : (ry ? 1 : 0)), FALSE); @@ -1210,8 +1208,8 @@ movebubbles() void water_friction() { - register int x, y, dx, dy; - register boolean eff = FALSE; + int x, y, dx, dy; + boolean eff = FALSE; if (Swimming && rn2(4)) return; /* natural swimmers have advantage */ @@ -1245,7 +1243,7 @@ void save_waterlevel(fd, mode) int fd, mode; { - register struct bubble *b; + struct bubble *b; if (!Is_waterlevel(&u.uz) && !Is_airlevel(&u.uz)) return; @@ -1268,11 +1266,10 @@ int fd, mode; void restore_waterlevel(fd) -register int fd; +int fd; { - register struct bubble *b = (struct bubble *) 0, *btmp; - register int i; - int n; + struct bubble *b = (struct bubble *) 0, *btmp; + int i, n; if (!Is_waterlevel(&u.uz) && !Is_airlevel(&u.uz)) return; @@ -1305,7 +1302,7 @@ const char * waterbody_name(x, y) xchar x, y; { - register struct rm *lev; + struct rm *lev; schar ltyp; if (!isok(x, y)) @@ -1344,10 +1341,10 @@ set_wportal() STATIC_OVL void setup_waterlevel() { - register int x, y; - register int xskip, yskip; - register int water_glyph = cmap_to_glyph(S_water); - register int air_glyph = cmap_to_glyph(S_air); + int x, y; + int xskip, yskip; + int water_glyph = cmap_to_glyph(S_water), + air_glyph = cmap_to_glyph(S_air); /* ouch, hardcoded... */ @@ -1380,7 +1377,7 @@ setup_waterlevel() STATIC_OVL void unsetup_waterlevel() { - register struct bubble *b, *bb; + struct bubble *b, *bb; /* free bubbles */ @@ -1393,7 +1390,7 @@ unsetup_waterlevel() STATIC_OVL void mk_bubble(x, y, n) -register int x, y, n; +int x, y, n; { /* * These bit masks make visually pleasing bubbles on a normal aspect @@ -1402,14 +1399,15 @@ register int x, y, n; * in situ, either. The first two elements tell the dimensions of * the bubble's bounding box. */ - static uchar bm2[] = { 2, 1, 0x3 }, bm3[] = { 3, 2, 0x7, 0x7 }, + static uchar bm2[] = { 2, 1, 0x3 }, + bm3[] = { 3, 2, 0x7, 0x7 }, bm4[] = { 4, 3, 0x6, 0xf, 0x6 }, bm5[] = { 5, 3, 0xe, 0x1f, 0xe }, bm6[] = { 6, 4, 0x1e, 0x3f, 0x3f, 0x1e }, bm7[] = { 7, 4, 0x3e, 0x7f, 0x7f, 0x3e }, bm8[] = { 8, 4, 0x7e, 0xff, 0xff, 0x7e }, *bmask[] = { bm2, bm3, bm4, bm5, bm6, bm7, bm8 }; - register struct bubble *b; + struct bubble *b; if (x >= bxmax || y >= bymax) return; @@ -1455,11 +1453,11 @@ register int x, y, n; */ STATIC_OVL void mv_bubble(b, dx, dy, ini) -register struct bubble *b; -register int dx, dy; -register boolean ini; +struct bubble *b; +int dx, dy; +boolean ini; { - register int x, y, i, j, colli = 0; + int x, y, i, j, colli = 0; struct container *cons, *ctemp; /* clouds move slowly */