WARNsify...

1 files changed, 275 insertions, 240 deletions

diff --git a/hack/hack.objnam.c b/hack/hack.objnam.c
index 2ab2f2ae..9a0048ee 100644
--- a/hack/hack.objnam.c
+++ b/hack/hack.objnam.c
@@ -1,49 +1,56 @@
+/*	$NetBSD: hack.objnam.c,v 1.4 1997/10/19 16:58:39 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.objnam.c,v 1.3 1995/03/23 08:31:10 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.objnam.c,v 1.4 1997/10/19 16:58:39 christos Exp $");
+#endif				/* not lint */
 
-#include	"hack.h"
+#include <stdlib.h>
+#include "hack.h"
+#include "extern.h"
 #define Sprintf (void) sprintf
 #define Strcat  (void) strcat
 #define	Strcpy	(void) strcpy
 #define	PREFIX	15
-extern char *eos();
-extern int bases[];
 
-char *
-strprepend(s,pref) register char *s, *pref; {
-register int i = strlen(pref);
-	if(i > PREFIX) {
+char           *
+strprepend(s, pref)
+	char           *s, *pref;
+{
+	int             i = strlen(pref);
+	if (i > PREFIX) {
 		pline("WARNING: prefix too short.");
-		return(s);
+		return (s);
 	}
 	s -= i;
 	(void) strncpy(s, pref, i);	/* do not copy trailing 0 */
-	return(s);
+	return (s);
 }
 
-char *
-sitoa(a) int a; {
-static char buf[13];
+char           *
+sitoa(a)
+	int             a;
+{
+	static char     buf[13];
 	Sprintf(buf, (a < 0) ? "%d" : "+%d", a);
-	return(buf);
+	return (buf);
 }
 
-char *
+char           *
 typename(otyp)
-register int otyp;
+	int             otyp;
 {
-static char buf[BUFSZ];
-register struct objclass *ocl = &objects[otyp];
-register char *an = ocl->oc_name;
-register char *dn = ocl->oc_descr;
-register char *un = ocl->oc_uname;
-register int nn = ocl->oc_name_known;
-	switch(ocl->oc_olet) {
+	static char     buf[BUFSZ];
+	struct objclass *ocl = &objects[otyp];
+	char           *an = ocl->oc_name;
+	char           *dn = ocl->oc_descr;
+	char           *un = ocl->oc_uname;
+	int             nn = ocl->oc_name_known;
+	switch (ocl->oc_olet) {
 	case POTION_SYM:
 		Strcpy(buf, "potion");
 		break;
@@ -57,60 +64,61 @@ register int nn = ocl->oc_name_known;
 		Strcpy(buf, "ring");
 		break;
 	default:
-		if(nn) {
+		if (nn) {
 			Strcpy(buf, an);
-			if(otyp >= TURQUOISE && otyp <= JADE)
+			if (otyp >= TURQUOISE && otyp <= JADE)
 				Strcat(buf, " stone");
-			if(un)
+			if (un)
 				Sprintf(eos(buf), " called %s", un);
-			if(dn)
+			if (dn)
 				Sprintf(eos(buf), " (%s)", dn);
 		} else {
 			Strcpy(buf, dn ? dn : an);
-			if(ocl->oc_olet == GEM_SYM)
+			if (ocl->oc_olet == GEM_SYM)
 				Strcat(buf, " gem");
-			if(un)
+			if (un)
 				Sprintf(eos(buf), " called %s", un);
 		}
-		return(buf);
+		return (buf);
 	}
 	/* here for ring/scroll/potion/wand */
-	if(nn)
+	if (nn)
 		Sprintf(eos(buf), " of %s", an);
-	if(un)
+	if (un)
 		Sprintf(eos(buf), " called %s", un);
-	if(dn)
+	if (dn)
 		Sprintf(eos(buf), " (%s)", dn);
-	return(buf);
+	return (buf);
 }
 
-char *
+char           *
 xname(obj)
-register struct obj *obj;
+	struct obj     *obj;
 {
-static char bufr[BUFSZ];
-register char *buf = &(bufr[PREFIX]);	/* leave room for "17 -3 " */
-register int nn = objects[obj->otyp].oc_name_known;
-register char *an = objects[obj->otyp].oc_name;
-register char *dn = objects[obj->otyp].oc_descr;
-register char *un = objects[obj->otyp].oc_uname;
-register int pl = (obj->quan != 1);
-	if(!obj->dknown && !Blind) obj->dknown = 1; /* %% doesnt belong here */
-	switch(obj->olet) {
+	static char     bufr[BUFSZ];
+	char           *buf = &(bufr[PREFIX]);	/* leave room for "17 -3 " */
+	int             nn = objects[obj->otyp].oc_name_known;
+	char           *an = objects[obj->otyp].oc_name;
+	char           *dn = objects[obj->otyp].oc_descr;
+	char           *un = objects[obj->otyp].oc_uname;
+	int             pl = (obj->quan != 1);
+	if (!obj->dknown && !Blind)
+		obj->dknown = 1;/* %% doesnt belong here */
+	switch (obj->olet) {
 	case AMULET_SYM:
 		Strcpy(buf, (obj->spe < 0 && obj->known)
-			? "cheap plastic imitation of the " : "");
-		Strcat(buf,"Amulet of Yendor");
+		       ? "cheap plastic imitation of the " : "");
+		Strcat(buf, "Amulet of Yendor");
 		break;
 	case TOOL_SYM:
-		if(!nn) {
+		if (!nn) {
 			Strcpy(buf, dn);
 			break;
 		}
-		Strcpy(buf,an);
+		Strcpy(buf, an);
 		break;
 	case FOOD_SYM:
-		if(obj->otyp == DEAD_HOMUNCULUS && pl) {
+		if (obj->otyp == DEAD_HOMUNCULUS && pl) {
 			pl = 0;
 			Strcpy(buf, "dead homunculi");
 			break;
@@ -118,12 +126,12 @@ register int pl = (obj->quan != 1);
 		/* fungis ? */
 		/* fall into next case */
 	case WEAPON_SYM:
-		if(obj->otyp == WORM_TOOTH && pl) {
+		if (obj->otyp == WORM_TOOTH && pl) {
 			pl = 0;
 			Strcpy(buf, "worm teeth");
 			break;
 		}
-		if(obj->otyp == CRYSKNIFE && pl) {
+		if (obj->otyp == CRYSKNIFE && pl) {
 			pl = 0;
 			Strcpy(buf, "crysknives");
 			break;
@@ -132,21 +140,22 @@ register int pl = (obj->quan != 1);
 	case ARMOR_SYM:
 	case CHAIN_SYM:
 	case ROCK_SYM:
-		Strcpy(buf,an);
+		Strcpy(buf, an);
 		break;
 	case BALL_SYM:
 		Sprintf(buf, "%sheavy iron ball",
 		  (obj->owt > objects[obj->otyp].oc_weight) ? "very " : "");
 		break;
 	case POTION_SYM:
-		if(nn || un || !obj->dknown) {
+		if (nn || un || !obj->dknown) {
 			Strcpy(buf, "potion");
-			if(pl) {
+			if (pl) {
 				pl = 0;
 				Strcat(buf, "s");
 			}
-			if(!obj->dknown) break;
-			if(un) {
+			if (!obj->dknown)
+				break;
+			if (un) {
 				Strcat(buf, " called ");
 				Strcat(buf, un);
 			} else {
@@ -160,15 +169,16 @@ register int pl = (obj->quan != 1);
 		break;
 	case SCROLL_SYM:
 		Strcpy(buf, "scroll");
-		if(pl) {
+		if (pl) {
 			pl = 0;
 			Strcat(buf, "s");
 		}
-		if(!obj->dknown) break;
-		if(nn) {
+		if (!obj->dknown)
+			break;
+		if (nn) {
 			Strcat(buf, " of ");
 			Strcat(buf, an);
-		} else if(un) {
+		} else if (un) {
 			Strcat(buf, " called ");
 			Strcat(buf, un);
 		} else {
@@ -177,376 +187,401 @@ register int pl = (obj->quan != 1);
 		}
 		break;
 	case WAND_SYM:
-		if(!obj->dknown)
+		if (!obj->dknown)
 			Sprintf(buf, "wand");
-		else if(nn)
+		else if (nn)
 			Sprintf(buf, "wand of %s", an);
-		else if(un)
+		else if (un)
 			Sprintf(buf, "wand called %s", un);
 		else
 			Sprintf(buf, "%s wand", dn);
 		break;
 	case RING_SYM:
-		if(!obj->dknown)
+		if (!obj->dknown)
 			Sprintf(buf, "ring");
-		else if(nn)
+		else if (nn)
 			Sprintf(buf, "ring of %s", an);
-		else if(un)
+		else if (un)
 			Sprintf(buf, "ring called %s", un);
 		else
 			Sprintf(buf, "%s ring", dn);
 		break;
 	case GEM_SYM:
-		if(!obj->dknown) {
+		if (!obj->dknown) {
 			Strcpy(buf, "gem");
 			break;
 		}
-		if(!nn) {
+		if (!nn) {
 			Sprintf(buf, "%s gem", dn);
 			break;
 		}
 		Strcpy(buf, an);
-		if(obj->otyp >= TURQUOISE && obj->otyp <= JADE)
+		if (obj->otyp >= TURQUOISE && obj->otyp <= JADE)
 			Strcat(buf, " stone");
 		break;
 	default:
-		Sprintf(buf,"glorkum %c (0%o) %u %d",
-			obj->olet,obj->olet,obj->otyp,obj->spe);
+		Sprintf(buf, "glorkum %c (0%o) %u %d",
+			obj->olet, obj->olet, obj->otyp, obj->spe);
 	}
-	if(pl) {
-		register char *p;
+	if (pl) {
+		char           *p;
 
-		for(p = buf; *p; p++) {
-			if(!strncmp(" of ", p, 4)) {
+		for (p = buf; *p; p++) {
+			if (!strncmp(" of ", p, 4)) {
 				/* pieces of, cloves of, lumps of */
-				register int c1, c2 = 's';
+				int             c1, c2 = 's';
 
 				do {
-					c1 = c2; c2 = *p; *p++ = c1;
-				} while(c1);
+					c1 = c2;
+					c2 = *p;
+					*p++ = c1;
+				} while (c1);
 				goto nopl;
 			}
 		}
-		p = eos(buf)-1;
-		if(*p == 's' || *p == 'z' || *p == 'x' ||
+		p = eos(buf) - 1;
+		if (*p == 's' || *p == 'z' || *p == 'x' ||
 		    (*p == 'h' && p[-1] == 's'))
 			Strcat(buf, "es");	/* boxes */
-		else if(*p == 'y' && !index(vowels, p[-1]))
+		else if (*p == 'y' && !strchr(vowels, p[-1]))
 			Strcpy(p, "ies");	/* rubies, zruties */
 		else
 			Strcat(buf, "s");
 	}
 nopl:
-	if(obj->onamelth) {
+	if (obj->onamelth) {
 		Strcat(buf, " named ");
 		Strcat(buf, ONAME(obj));
 	}
-	return(buf);
+	return (buf);
 }
 
-char *
+char           *
 doname(obj)
-register struct obj *obj;
+	struct obj     *obj;
 {
-char prefix[PREFIX];
-register char *bp = xname(obj);
-	if(obj->quan != 1)
+	char            prefix[PREFIX];
+	char           *bp = xname(obj);
+	if (obj->quan != 1)
 		Sprintf(prefix, "%u ", obj->quan);
 	else
 		Strcpy(prefix, "a ");
-	switch(obj->olet) {
+	switch (obj->olet) {
 	case AMULET_SYM:
-		if(strncmp(bp, "cheap ", 6))
+		if (strncmp(bp, "cheap ", 6))
 			Strcpy(prefix, "the ");
 		break;
 	case ARMOR_SYM:
-		if(obj->owornmask & W_ARMOR)
+		if (obj->owornmask & W_ARMOR)
 			Strcat(bp, " (being worn)");
 		/* fall into next case */
 	case WEAPON_SYM:
-		if(obj->known) {
+		if (obj->known) {
 			Strcat(prefix, sitoa(obj->spe));
 			Strcat(prefix, " ");
 		}
 		break;
 	case WAND_SYM:
-		if(obj->known)
+		if (obj->known)
 			Sprintf(eos(bp), " (%d)", obj->spe);
 		break;
 	case RING_SYM:
-		if(obj->owornmask & W_RINGR) Strcat(bp, " (on right hand)");
-		if(obj->owornmask & W_RINGL) Strcat(bp, " (on left hand)");
-		if(obj->known && (objects[obj->otyp].bits & SPEC)) {
+		if (obj->owornmask & W_RINGR)
+			Strcat(bp, " (on right hand)");
+		if (obj->owornmask & W_RINGL)
+			Strcat(bp, " (on left hand)");
+		if (obj->known && (objects[obj->otyp].bits & SPEC)) {
 			Strcat(prefix, sitoa(obj->spe));
 			Strcat(prefix, " ");
 		}
 		break;
 	}
-	if(obj->owornmask & W_WEP)
+	if (obj->owornmask & W_WEP)
 		Strcat(bp, " (weapon in hand)");
-	if(obj->unpaid)
+	if (obj->unpaid)
 		Strcat(bp, " (unpaid)");
-	if(!strcmp(prefix, "a ") && index(vowels, *bp))
+	if (!strcmp(prefix, "a ") && strchr(vowels, *bp))
 		Strcpy(prefix, "an ");
 	bp = strprepend(bp, prefix);
-	return(bp);
+	return (bp);
 }
 
 /* used only in hack.fight.c (thitu) */
-setan(str,buf)
-register char *str,*buf;
+void
+setan(str, buf)
+	char           *str, *buf;
 {
-	if(index(vowels,*str))
+	if (strchr(vowels, *str))
 		Sprintf(buf, "an %s", str);
 	else
 		Sprintf(buf, "a %s", str);
 }
 
-char *
-aobjnam(otmp,verb) register struct obj *otmp; register char *verb; {
-register char *bp = xname(otmp);
-char prefix[PREFIX];
-	if(otmp->quan != 1) {
+char           *
+aobjnam(otmp, verb)
+	struct obj     *otmp;
+	char           *verb;
+{
+	char           *bp = xname(otmp);
+	char            prefix[PREFIX];
+	if (otmp->quan != 1) {
 		Sprintf(prefix, "%u ", otmp->quan);
 		bp = strprepend(bp, prefix);
 	}
-
-	if(verb) {
+	if (verb) {
 		/* verb is given in plural (i.e., without trailing s) */
 		Strcat(bp, " ");
-		if(otmp->quan != 1)
+		if (otmp->quan != 1)
 			Strcat(bp, verb);
-		else if(!strcmp(verb, "are"))
+		else if (!strcmp(verb, "are"))
 			Strcat(bp, "is");
 		else {
 			Strcat(bp, verb);
 			Strcat(bp, "s");
 		}
 	}
-	return(bp);
+	return (bp);
 }
 
-char *
+char           *
 Doname(obj)
-register struct obj *obj;
+	struct obj     *obj;
 {
-	register char *s = doname(obj);
+	char           *s = doname(obj);
 
-	if('a' <= *s && *s <= 'z') *s -= ('a' - 'A');
-	return(s);
+	if ('a' <= *s && *s <= 'z')
+		*s -= ('a' - 'A');
+	return (s);
 }
 
-char *wrp[] = { "wand", "ring", "potion", "scroll", "gem" };
-char wrpsym[] = { WAND_SYM, RING_SYM, POTION_SYM, SCROLL_SYM, GEM_SYM };
+char           *wrp[] = {"wand", "ring", "potion", "scroll", "gem"};
+char            wrpsym[] = {WAND_SYM, RING_SYM, POTION_SYM, SCROLL_SYM, GEM_SYM};
 
-struct obj *
-readobjnam(bp) register char *bp; {
-register char *p;
-register int i;
-int cnt, spe, spesgn, typ, heavy;
-char let;
-char *un, *dn, *an;
-/* int the = 0; char *oname = 0; */
+struct obj     *
+readobjnam(bp)
+	char           *bp;
+{
+	char           *p;
+	int             i;
+	int             cnt, spe, spesgn, typ, heavy;
+	char            let;
+	char           *un, *dn, *an;
+	/* int the = 0; char *oname = 0; */
 	cnt = spe = spesgn = typ = heavy = 0;
 	let = 0;
 	an = dn = un = 0;
-	for(p = bp; *p; p++)
-		if('A' <= *p && *p <= 'Z') *p += 'a'-'A';
-	if(!strncmp(bp, "the ", 4)){
-/*		the = 1; */
+	for (p = bp; *p; p++)
+		if ('A' <= *p && *p <= 'Z')
+			*p += 'a' - 'A';
+	if (!strncmp(bp, "the ", 4)) {
+		/* the = 1; */
 		bp += 4;
-	} else if(!strncmp(bp, "an ", 3)){
+	} else if (!strncmp(bp, "an ", 3)) {
 		cnt = 1;
 		bp += 3;
-	} else if(!strncmp(bp, "a ", 2)){
+	} else if (!strncmp(bp, "a ", 2)) {
 		cnt = 1;
 		bp += 2;
 	}
-	if(!cnt && digit(*bp)){
+	if (!cnt && digit(*bp)) {
 		cnt = atoi(bp);
-		while(digit(*bp)) bp++;
-		while(*bp == ' ') bp++;
+		while (digit(*bp))
+			bp++;
+		while (*bp == ' ')
+			bp++;
 	}
-	if(!cnt) cnt = 1;		/* %% what with "gems" etc. ? */
+	if (!cnt)
+		cnt = 1;	/* %% what with "gems" etc. ? */
 
-	if(*bp == '+' || *bp == '-'){
+	if (*bp == '+' || *bp == '-') {
 		spesgn = (*bp++ == '+') ? 1 : -1;
 		spe = atoi(bp);
-		while(digit(*bp)) bp++;
-		while(*bp == ' ') bp++;
+		while (digit(*bp))
+			bp++;
+		while (*bp == ' ')
+			bp++;
 	} else {
-		p = rindex(bp, '(');
-		if(p) {
-			if(p > bp && p[-1] == ' ') p[-1] = 0;
-			else *p = 0;
+		p = strrchr(bp, '(');
+		if (p) {
+			if (p > bp && p[-1] == ' ')
+				p[-1] = 0;
+			else
+				*p = 0;
 			p++;
 			spe = atoi(p);
-			while(digit(*p)) p++;
-			if(strcmp(p, ")")) spe = 0;
-			else spesgn = 1;
+			while (digit(*p))
+				p++;
+			if (strcmp(p, ")"))
+				spe = 0;
+			else
+				spesgn = 1;
 		}
 	}
-	/* now we have the actual name, as delivered by xname, say
-		green potions called whisky
-		scrolls labeled "QWERTY"
-		egg
-		dead zruties
-		fortune cookies
-		very heavy iron ball named hoei
-		wand of wishing
-		elven cloak
-	*/
-	for(p = bp; *p; p++) if(!strncmp(p, " named ", 7)) {
-		*p = 0;
-/*		oname = p+7; */
-	}
-	for(p = bp; *p; p++) if(!strncmp(p, " called ", 8)) {
-		*p = 0;
-		un = p+8;
-	}
-	for(p = bp; *p; p++) if(!strncmp(p, " labeled ", 9)) {
-		*p = 0;
-		dn = p+9;
-	}
-
+	/*
+	 * now we have the actual name, as delivered by xname, say green
+	 * potions called whisky scrolls labeled "QWERTY" egg dead zruties
+	 * fortune cookies very heavy iron ball named hoei wand of wishing
+	 * elven cloak
+	 */
+	for (p = bp; *p; p++)
+		if (!strncmp(p, " named ", 7)) {
+			*p = 0;
+			/* oname = p+7; */
+		}
+	for (p = bp; *p; p++)
+		if (!strncmp(p, " called ", 8)) {
+			*p = 0;
+			un = p + 8;
+		}
+	for (p = bp; *p; p++)
+		if (!strncmp(p, " labeled ", 9)) {
+			*p = 0;
+			dn = p + 9;
+		}
 	/* first change to singular if necessary */
-	if(cnt != 1) {
+	if (cnt != 1) {
 		/* find "cloves of garlic", "worthless pieces of blue glass" */
-		for(p = bp; *p; p++) if(!strncmp(p, "s of ", 5)){
-			while(*p = p[1]) p++;
-			goto sing;
-		}
+		for (p = bp; *p; p++)
+			if (!strncmp(p, "s of ", 5)) {
+				while ((*p = p[1]) != '\0')
+					p++;
+				goto sing;
+			}
 		/* remove -s or -es (boxes) or -ies (rubies, zruties) */
 		p = eos(bp);
-		if(p[-1] == 's') {
-			if(p[-2] == 'e') {
-				if(p[-3] == 'i') {
-					if(!strcmp(p-7, "cookies"))
+		if (p[-1] == 's') {
+			if (p[-2] == 'e') {
+				if (p[-3] == 'i') {
+					if (!strcmp(p - 7, "cookies"))
 						goto mins;
-					Strcpy(p-3, "y");
+					Strcpy(p - 3, "y");
 					goto sing;
 				}
-
 				/* note: cloves / knives from clove / knife */
-				if(!strcmp(p-6, "knives")) {
-					Strcpy(p-3, "fe");
+				if (!strcmp(p - 6, "knives")) {
+					Strcpy(p - 3, "fe");
 					goto sing;
 				}
-
 				/* note: nurses, axes but boxes */
-				if(!strcmp(p-5, "boxes")) {
+				if (!strcmp(p - 5, "boxes")) {
 					p[-2] = 0;
 					goto sing;
 				}
 			}
-		mins:
+	mins:
 			p[-1] = 0;
 		} else {
-			if(!strcmp(p-9, "homunculi")) {
-				Strcpy(p-1, "us"); /* !! makes string longer */
+			if (!strcmp(p - 9, "homunculi")) {
+				Strcpy(p - 1, "us");	/* !! makes string
+							 * longer */
 				goto sing;
 			}
-			if(!strcmp(p-5, "teeth")) {
-				Strcpy(p-5, "tooth");
+			if (!strcmp(p - 5, "teeth")) {
+				Strcpy(p - 5, "tooth");
 				goto sing;
 			}
 			/* here we cannot find the plural suffix */
 		}
 	}
 sing:
-	if(!strcmp(bp, "amulet of yendor")) {
+	if (!strcmp(bp, "amulet of yendor")) {
 		typ = AMULET_OF_YENDOR;
 		goto typfnd;
 	}
 	p = eos(bp);
-	if(!strcmp(p-5, " mail")){	/* Note: ring mail is not a ring ! */
+	if (!strcmp(p - 5, " mail")) {	/* Note: ring mail is not a ring ! */
 		let = ARMOR_SYM;
 		an = bp;
 		goto srch;
 	}
-	for(i = 0; i < sizeof(wrpsym); i++) {
-		register int j = strlen(wrp[i]);
-		if(!strncmp(bp, wrp[i], j)){
+	for (i = 0; i < sizeof(wrpsym); i++) {
+		int             j = strlen(wrp[i]);
+		if (!strncmp(bp, wrp[i], j)) {
 			let = wrpsym[i];
 			bp += j;
-			if(!strncmp(bp, " of ", 4)) an = bp+4;
+			if (!strncmp(bp, " of ", 4))
+				an = bp + 4;
 			/* else if(*bp) ?? */
 			goto srch;
 		}
-		if(!strcmp(p-j, wrp[i])){
+		if (!strcmp(p - j, wrp[i])) {
 			let = wrpsym[i];
 			p -= j;
 			*p = 0;
-			if(p[-1] == ' ') p[-1] = 0;
+			if (p[-1] == ' ')
+				p[-1] = 0;
 			dn = bp;
 			goto srch;
 		}
 	}
-	if(!strcmp(p-6, " stone")){
+	if (!strcmp(p - 6, " stone")) {
 		p[-6] = 0;
 		let = GEM_SYM;
 		an = bp;
 		goto srch;
 	}
-	if(!strcmp(bp, "very heavy iron ball")){
+	if (!strcmp(bp, "very heavy iron ball")) {
 		heavy = 1;
 		typ = HEAVY_IRON_BALL;
 		goto typfnd;
 	}
 	an = bp;
 srch:
-	if(!an && !dn && !un)
+	if (!an && !dn && !un)
 		goto any;
 	i = 1;
-	if(let) i = bases[letindex(let)];
-	while(i <= NROFOBJECTS && (!let || objects[i].oc_olet == let)){
-		register char *zn = objects[i].oc_name;
+	if (let)
+		i = bases[letindex(let)];
+	while (i <= NROFOBJECTS && (!let || objects[i].oc_olet == let)) {
+		char           *zn = objects[i].oc_name;
 
-		if(!zn) goto nxti;
-		if(an && strcmp(an, zn))
+		if (!zn)
+			goto nxti;
+		if (an && strcmp(an, zn))
 			goto nxti;
-		if(dn && (!(zn = objects[i].oc_descr) || strcmp(dn, zn)))
+		if (dn && (!(zn = objects[i].oc_descr) || strcmp(dn, zn)))
 			goto nxti;
-		if(un && (!(zn = objects[i].oc_uname) || strcmp(un, zn)))
+		if (un && (!(zn = objects[i].oc_uname) || strcmp(un, zn)))
 			goto nxti;
 		typ = i;
 		goto typfnd;
-	nxti:
+nxti:
 		i++;
 	}
 any:
-	if(!let) let = wrpsym[rn2(sizeof(wrpsym))];
+	if (!let)
+		let = wrpsym[rn2(sizeof(wrpsym))];
 	typ = probtype(let);
 typfnd:
-	{ register struct obj *otmp;
-	  extern struct obj *mksobj();
-	let = objects[typ].oc_olet;
-	otmp = mksobj(typ);
-	if(heavy)
-		otmp->owt += 15;
-	if(cnt > 0 && index("%?!*)", let) &&
+	{
+		struct obj     *otmp;
+		let = objects[typ].oc_olet;
+		otmp = mksobj(typ);
+		if (heavy)
+			otmp->owt += 15;
+		if (cnt > 0 && strchr("%?!*)", let) &&
 		(cnt < 4 || (let == WEAPON_SYM && typ <= ROCK && cnt < 20)))
-		otmp->quan = cnt;
+			otmp->quan = cnt;
 
-	if(spe > 3 && spe > otmp->spe)
-		spe = 0;
-	else if(let == WAND_SYM)
-		spe = otmp->spe;
-	if(spe == 3 && u.uluck < 0)
-		spesgn = -1;
-	if(let != WAND_SYM && spesgn == -1)
-		spe = -spe;
-	if(let == BALL_SYM)
-		spe = 0;
-	else if(let == AMULET_SYM)
-		spe = -1;
-	else if(typ == WAN_WISHING && rn2(10))
-		spe = (rn2(10) ? -1 : 0);
-	otmp->spe = spe;
+		if (spe > 3 && spe > otmp->spe)
+			spe = 0;
+		else if (let == WAND_SYM)
+			spe = otmp->spe;
+		if (spe == 3 && u.uluck < 0)
+			spesgn = -1;
+		if (let != WAND_SYM && spesgn == -1)
+			spe = -spe;
+		if (let == BALL_SYM)
+			spe = 0;
+		else if (let == AMULET_SYM)
+			spe = -1;
+		else if (typ == WAN_WISHING && rn2(10))
+			spe = (rn2(10) ? -1 : 0);
+		otmp->spe = spe;
 
-	if(spesgn == -1)
-		otmp->cursed = 1;
+		if (spesgn == -1)
+			otmp->cursed = 1;
 
-	return(otmp);
-    }
+		return (otmp);
+	}
 }