From d2ca7d4ed2c9ab03ba20a18fa53613d7baaa9026 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 24 Mar 2008 11:38:25 +0100 Subject: [PATCH] Use XYOFFSET() instead of sctoff() in sector iterators Old code didn't check value of sctoff() for success. But it can't fail, because we already took care of the condition that can make it fail. Moreover, the arguments are already normalized. Therefore, we can just call XYOFFSET(). --- src/lib/subs/maps.c | 2 +- src/lib/subs/nxtsct.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c index 6d5957e74..5e2a6a476 100644 --- a/src/lib/subs/maps.c +++ b/src/lib/subs/maps.c @@ -319,7 +319,7 @@ bmnxtsct(struct nstr_sect *np) if (np->curdist > np->dist) continue; } - np->id = sctoff(np->x, np->y); + np->id = XYOFFSET(np->x, np->y); return 1; } /*NOTREACHED*/ diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c index 6ad13e6c9..bbce16279 100644 --- a/src/lib/subs/nxtsct.c +++ b/src/lib/subs/nxtsct.c @@ -67,7 +67,7 @@ nxtsct(struct nstr_sect *np, struct sctstr *sp) if (np->curdist > np->dist) continue; } - np->id = sctoff(np->x, np->y); + np->id = XYOFFSET(np->x, np->y); if (!np->read(EF_SECTOR, np->id, sp)) continue; if (np->ncond == 0) -- 2.43.0