--- ray/src/rt/ambient.c	2010/10/14 05:54:44	2.68
+++ ray/src/rt/ambient.c	2014/04/26 02:59:16	2.82
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ambient.c,v 2.68 2010/10/14 05:54:44 greg Exp $";
+static const char	RCSid[] = "$Id: ambient.c,v 2.82 2014/04/26 02:59:16 greg Exp $";
 #endif
 /*
  *  ambient.c - routines dealing with ambient (inter-reflected) component.
@@ -39,9 +39,9 @@ static int  nunflshed = 0;	/* number of unflushed ambi
 
 #ifndef SORT_THRESH
 #ifdef SMLMEM
-#define SORT_THRESH	((3L<<20)/sizeof(AMBVAL))
+#define SORT_THRESH	((16L<<20)/sizeof(AMBVAL))
 #else
-#define SORT_THRESH	((9L<<20)/sizeof(AMBVAL))
+#define SORT_THRESH	((64L<<20)/sizeof(AMBVAL))
 #endif
 #endif
 #ifndef SORT_INTVL
@@ -51,6 +51,8 @@ static int  nunflshed = 0;	/* number of unflushed ambi
 #define MAX_SORT_INTVL	(SORT_INTVL<<6)
 #endif
 
+
+static double  qambacc = 0.;		/* ambient accuracy to the 1/4 power */
 static double  avsum = 0.;		/* computed ambient value sum (log) */
 static unsigned int  navsum = 0;	/* number of values in avsum */
 static unsigned int  nambvals = 0;	/* total number of indirect values */
@@ -84,9 +86,10 @@ static AMBVAL *avstore(AMBVAL  *aval);
 static AMBTREE *newambtree(void);
 static void freeambtree(AMBTREE  *atp);
 
-typedef void unloadtf_t(void *);
+typedef void unloadtf_t(AMBVAL *);
 static unloadtf_t avinsert;
 static unloadtf_t av2list;
+static unloadtf_t avfree;
 static void unloadatree(AMBTREE  *at, unloadtf_t *f);
 
 static int aposcmp(const void *avp1, const void *avp2);
@@ -98,7 +101,7 @@ static void aflock(int  typ);
 #endif
 
 
-extern void
+void
 setambres(				/* set ambient resolution */
 	int  ar
 )
@@ -121,22 +124,23 @@ setambres(				/* set ambient resolution */
 }
 
 
-extern void
+void
 setambacc(				/* set ambient accuracy */
 	double  newa
 )
 {
-	double  ambdiff;
-
-	if (newa < 0.0)
-		newa = 0.0;
-	ambdiff = fabs(newa - ambacc);
-	if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0)
-		sortambvals(1);			/* rebuild tree */
+	double	olda = qambacc*qambacc*qambacc*qambacc;
+	
+	newa *= (newa > 0);
+	if (fabs(newa - olda) >= .05*(newa + olda)) {
+		qambacc = sqrt(sqrt(ambacc = newa));
+		if (nambvals > 0)
+			sortambvals(1);		/* rebuild tree */
+	}
 }
 
 
-extern void
+void
 setambient(void)				/* initialize calculation */
 {
 	int	readonly = 0;
@@ -194,13 +198,16 @@ setambient(void)				/* initialize calculation */
 		sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
 		error(SYSTEM, errmsg);
 	}
+#ifdef getc_unlocked
+	flockfile(ambfp);			/* application-level lock */
+#endif
 #ifdef  F_SETLKW
 	aflock(F_UNLCK);			/* release file */
 #endif
 }
 
 
-extern void
+void
 ambdone(void)			/* close ambient file and free memory */
 {
 	if (ambfp != NULL) {		/* close ambient file */
@@ -214,7 +221,7 @@ ambdone(void)			/* close ambient file and free memory 
 		lastpos = -1;
 	}
 					/* free ambient tree */
-	unloadatree(&atrunk, free);
+	unloadatree(&atrunk, &avfree);
 					/* reset state variables */
 	avsum = 0.;
 	navsum = 0;
@@ -226,14 +233,14 @@ ambdone(void)			/* close ambient file and free memory 
 }
 
 
-extern void
+void
 ambnotify(			/* record new modifier */
 	OBJECT	obj
 )
 {
 	static int  hitlimit = 0;
-	register OBJREC	 *o;
-	register char  **amblp;
+	OBJREC	 *o;
+	char  **amblp;
 
 	if (obj == OVOID) {		/* starting over */
 		ambset[0] = 0;
@@ -255,16 +262,28 @@ ambnotify(			/* record new modifier */
 		}
 }
 
+/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/
 
-extern void
+#ifdef NEWAMB
+
+#define tfunc(lwr, x, upr)	(((x)-(lwr))/((upr)-(lwr)))
+
+static double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
+				AMBTREE *at, FVECT c0, double s);
+static int	makeambient(COLOR acol, RAY *r, FVECT rn, int al);
+static void	extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, 
+				FVECT uvw[3]);
+
+void
 multambient(		/* compute ambient component & multiply by coef. */
 	COLOR  aval,
-	register RAY  *r,
+	RAY  *r,
 	FVECT  nrm
 )
 {
 	static int  rdepth = 0;			/* ambient recursion */
 	COLOR	acol;
+	int	ok;
 	double	d, l;
 
 	if (ambdiv <= 0)			/* no ambient calculation */
@@ -280,6 +299,298 @@ multambient(		/* compute ambient component & multiply 
 	if (ambacc <= FTINY) {			/* no ambient storage */
 		copycolor(acol, aval);
 		rdepth++;
+		ok = doambient(acol, r, r->rweight, NULL, NULL, NULL, NULL);
+		rdepth--;
+		if (!ok)
+			goto dumbamb;
+		copycolor(aval, acol);
+		return;
+	}
+
+	if (tracktime)				/* sort to minimize thrashing */
+		sortambvals(0);
+						/* interpolate ambient value */
+	setcolor(acol, 0.0, 0.0, 0.0);
+	d = sumambient(acol, r, nrm, rdepth,
+			&atrunk, thescene.cuorg, thescene.cusize);
+	if (d > FTINY) {
+		d = 1.0/d;
+		scalecolor(acol, d);
+		multcolor(aval, acol);
+		return;
+	}
+	rdepth++;				/* need to cache new value */
+	ok = makeambient(acol, r, nrm, rdepth-1);
+	rdepth--;
+	if (ok) {
+		multcolor(aval, acol);		/* computed new value */
+		return;
+	}
+dumbamb:					/* return global value */
+	if ((ambvwt <= 0) | (navsum == 0)) {
+		multcolor(aval, ambval);
+		return;
+	}
+	l = bright(ambval);			/* average in computations */
+	if (l > FTINY) {
+		d = (log(l)*(double)ambvwt + avsum) /
+				(double)(ambvwt + navsum);
+		d = exp(d) / l;
+		scalecolor(aval, d);
+		multcolor(aval, ambval);	/* apply color of ambval */
+	} else {
+		d = exp( avsum / (double)navsum );
+		scalecolor(aval, d);		/* neutral color */
+	}
+}
+
+
+double
+sumambient(		/* get interpolated ambient value */
+	COLOR  acol,
+	RAY  *r,
+	FVECT  rn,
+	int  al,
+	AMBTREE	 *at,
+	FVECT  c0,
+	double	s
+)
+{			/* initial limit is 10 degrees plus ambacc radians */
+	const double	minangle = 10.0 * PI/180.;
+	const double	maxangle = (minangle+ambacc-PI/2.)*pow(r->rweight,0.13)
+					+ PI/2.;
+	double		wsum = 0.0;
+	FVECT		ck0;
+	int		i, j;
+	AMBVAL		*av;
+					/* sum this node */
+	for (av = at->alist; av != NULL; av = av->next) {
+		double	d, delta_r2, delta_t2;
+		COLOR	ct;
+		FVECT	uvw[3];
+					/* record access */
+		if (tracktime)
+			av->latick = ambclock;
+		/*
+		 *  Ambient level test
+		 */
+		if (av->lvl > al)	/* list sorted, so this works */
+			break;
+		if (av->weight < 0.9*r->rweight)
+			continue;
+		/*
+		 *  Direction test using unperturbed normal
+		 */
+		decodedir(uvw[2], av->ndir);
+		d = DOT(uvw[2], r->ron);
+		if (d <= 0.0)		/* >= 90 degrees */
+			continue;
+		delta_r2 = 2.0 - 2.0*d;	/* approx. radians^2 */
+		if (delta_r2 >= maxangle*maxangle)
+			continue;
+		/*
+		 *  Modified ray behind test
+		 */
+		VSUB(ck0, av->pos, r->rop);
+		d = DOT(ck0, uvw[2]);
+		if (d < -minarad*qambacc-.001)
+			continue;
+		d /= av->rad[0];
+		delta_t2 = d*d;
+		if (delta_t2 >= qambacc*qambacc)
+			continue;
+		/*
+		 *  Elliptical radii test based on Hessian
+		 */
+		decodedir(uvw[0], av->udir);
+		VCROSS(uvw[1], uvw[2], uvw[0]);
+		d = DOT(ck0, uvw[0]) / av->rad[0];
+		delta_t2 += d*d;
+		d = DOT(ck0, uvw[1]) / av->rad[1];
+		delta_t2 += d*d;
+		if (delta_t2 >= qambacc*qambacc)
+			continue;
+		/*
+		 *  Extrapolate value and compute final weight (hat function)
+		 */
+		extambient(ct, av, r->rop, rn, uvw);
+		d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
+			tfunc(qambacc, sqrt(delta_t2), 0.0);
+		scalecolor(ct, d);
+		addcolor(acol, ct);
+		wsum += d;
+	}
+	if (at->kid == NULL)
+		return(wsum);
+					/* sum children */
+	s *= 0.5;
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < 3; j++) {
+			ck0[j] = c0[j];
+			if (1<<j & i)
+				ck0[j] += s;
+			if (r->rop[j] < ck0[j] - OCTSCALE*s)
+				break;
+			if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s)
+				break;
+		}
+		if (j == 3)
+			wsum += sumambient(acol, r, rn, al,
+						at->kid+i, ck0, s);
+	}
+	return(wsum);
+}
+
+
+int
+makeambient(		/* make a new ambient value for storage */
+	COLOR  acol,
+	RAY  *r,
+	FVECT  rn,
+	int  al
+)
+{
+	AMBVAL	amb;
+	FVECT	uvw[3];
+	int	i;
+
+	amb.weight = 1.0;			/* compute weight */
+	for (i = al; i-- > 0; )
+		amb.weight *= AVGREFL;
+	if (r->rweight < 0.1*amb.weight)	/* heuristic override */
+		amb.weight = 1.25*r->rweight;
+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
+						/* compute ambient */
+	i = doambient(acol, r, amb.weight, uvw, amb.rad, amb.gpos, amb.gdir);
+	scalecolor(acol, 1./AVGREFL);		/* undo assumed reflectance */
+	if (i <= 0 || amb.rad[0] <= FTINY)	/* no Hessian or zero radius */
+		return(i);
+						/* store value */
+	VCOPY(amb.pos, r->rop);
+	amb.ndir = encodedir(r->ron);
+	amb.udir = encodedir(uvw[0]);
+	amb.lvl = al;
+	copycolor(amb.val, acol);
+						/* insert into tree */
+	avsave(&amb);				/* and save to file */
+	if (rn != r->ron) {			/* texture */
+		VCOPY(uvw[2], r->ron);
+		extambient(acol, &amb, r->rop, rn, uvw);
+	}
+	return(1);
+}
+
+
+void
+extambient(		/* extrapolate value at pv, nv */
+	COLOR  cr,
+	AMBVAL	 *ap,
+	FVECT  pv,
+	FVECT  nv,
+	FVECT  uvw[3]
+)
+{
+	static FVECT	my_uvw[3];
+	FVECT		v1;
+	int		i;
+	double		d = 1.0;	/* zeroeth order */
+
+	if (uvw == NULL) {		/* need local coordinates? */
+		decodedir(my_uvw[2], ap->ndir);
+		decodedir(my_uvw[0], ap->udir);
+		VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]);
+		uvw = my_uvw;
+	}
+	for (i = 3; i--; )		/* gradient due to translation */
+		d += (pv[i] - ap->pos[i]) *
+			(ap->gpos[0]*uvw[0][i] + ap->gpos[1]*uvw[1][i]);
+
+	VCROSS(v1, uvw[2], nv);		/* gradient due to rotation */
+	for (i = 3; i--; )
+		d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]);
+	
+	if (d <= 0.0) {
+		setcolor(cr, 0.0, 0.0, 0.0);
+		return;
+	}
+	copycolor(cr, ap->val);
+	scalecolor(cr, d);
+}
+
+
+static void
+avinsert(				/* insert ambient value in our tree */
+	AMBVAL *av
+)
+{
+	AMBTREE  *at;
+	AMBVAL  *ap;
+	AMBVAL  avh;
+	FVECT  ck0;
+	double	s;
+	int  branch;
+	int  i;
+
+	if (av->rad[0] <= FTINY)
+		error(CONSISTENCY, "zero ambient radius in avinsert");
+	at = &atrunk;
+	VCOPY(ck0, thescene.cuorg);
+	s = thescene.cusize;
+	while (s*(OCTSCALE/2) > av->rad[1]*qambacc) {
+		if (at->kid == NULL)
+			if ((at->kid = newambtree()) == NULL)
+				error(SYSTEM, "out of memory in avinsert");
+		s *= 0.5;
+		branch = 0;
+		for (i = 0; i < 3; i++)
+			if (av->pos[i] > ck0[i] + s) {
+				ck0[i] += s;
+				branch |= 1 << i;
+			}
+		at = at->kid + branch;
+	}
+	avh.next = at->alist;		/* order by increasing level */
+	for (ap = &avh; ap->next != NULL; ap = ap->next)
+		if (ap->next->lvl >= av->lvl)
+			break;
+	av->next = ap->next;
+	ap->next = (AMBVAL*)av;
+	at->alist = avh.next;
+}
+
+
+#else /* ! NEWAMB */
+
+static double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
+				AMBTREE *at, FVECT c0, double s);
+static double	makeambient(COLOR acol, RAY *r, FVECT rn, int al);
+static void	extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
+
+
+void
+multambient(		/* compute ambient component & multiply by coef. */
+	COLOR  aval,
+	RAY  *r,
+	FVECT  nrm
+)
+{
+	static int  rdepth = 0;			/* ambient recursion */
+	COLOR	acol;
+	double	d, l;
+
+	if (ambdiv <= 0)			/* no ambient calculation */
+		goto dumbamb;
+						/* check number of bounces */
+	if (rdepth >= ambounce)
+		goto dumbamb;
+						/* check ambient list */
+	if (ambincl != -1 && r->ro != NULL &&
+			ambincl != inset(ambset, r->ro->omod))
+		goto dumbamb;
+
+	if (ambacc <= FTINY) {			/* no ambient storage */
+		copycolor(acol, aval);
+		rdepth++;
 		d = doambient(acol, r, r->rweight, NULL, NULL);
 		rdepth--;
 		if (d <= FTINY)
@@ -326,10 +637,10 @@ dumbamb:					/* return global value */
 }
 
 
-extern double
+static double
 sumambient(	/* get interpolated ambient value */
 	COLOR  acol,
-	register RAY  *r,
+	RAY  *r,
 	FVECT  rn,
 	int  al,
 	AMBTREE	 *at,
@@ -341,8 +652,8 @@ sumambient(	/* get interpolated ambient value */
 	COLOR  ct;
 	FVECT  ck0;
 	int  i;
-	register int  j;
-	register AMBVAL	 *av;
+	int  j;
+	AMBVAL	 *av;
 
 	wsum = 0.0;
 					/* do this node */
@@ -360,13 +671,8 @@ sumambient(	/* get interpolated ambient value */
 		/*
 		 *  Ambient radius test.
 		 */
-		d = av->pos[0] - r->rop[0];
-		e1 = d * d;
-		d = av->pos[1] - r->rop[1];
-		e1 += d * d;
-		d = av->pos[2] - r->rop[2];
-		e1 += d * d;
-		e1 /= av->rad * av->rad;
+		VSUB(ck0, av->pos, r->rop);
+		e1 = DOT(ck0, ck0) / (av->rad * av->rad);
 		if (e1 > ambacc*ambacc*1.21)
 			continue;
 		/*
@@ -383,8 +689,9 @@ sumambient(	/* get interpolated ambient value */
 			}
 		}
 		e2 = (1.0 - d) * r->rweight;
-		if (e2 < 0.0) e2 = 0.0;
-		if (e1 + e2 > ambacc*ambacc*1.21)
+		if (e2 < 0.0)
+			e2 = 0.0;
+		else if (e1 + e2 > ambacc*ambacc*1.21)
 			continue;
 		/*
 		 *  Ray behind test.
@@ -441,7 +748,7 @@ sumambient(	/* get interpolated ambient value */
 }
 
 
-extern double
+static double
 makeambient(		/* make a new ambient value for storage */
 	COLOR  acol,
 	RAY  *r,
@@ -481,16 +788,16 @@ makeambient(		/* make a new ambient value for storage 
 }
 
 
-extern void
+static void
 extambient(		/* extrapolate value at pv, nv */
 	COLOR  cr,
-	register AMBVAL	 *ap,
+	AMBVAL	 *ap,
 	FVECT  pv,
 	FVECT  nv
 )
 {
 	FVECT  v1;
-	register int  i;
+	int  i;
 	double	d;
 
 	d = 1.0;			/* zeroeth order */
@@ -510,6 +817,50 @@ extambient(		/* extrapolate value at pv, nv */
 
 
 static void
+avinsert(				/* insert ambient value in our tree */
+	AMBVAL *av
+)
+{
+	AMBTREE  *at;
+	AMBVAL  *ap;
+	AMBVAL  avh;
+	FVECT  ck0;
+	double	s;
+	int  branch;
+	int  i;
+
+	if (av->rad <= FTINY)
+		error(CONSISTENCY, "zero ambient radius in avinsert");
+	at = &atrunk;
+	VCOPY(ck0, thescene.cuorg);
+	s = thescene.cusize;
+	while (s*(OCTSCALE/2) > av->rad*ambacc) {
+		if (at->kid == NULL)
+			if ((at->kid = newambtree()) == NULL)
+				error(SYSTEM, "out of memory in avinsert");
+		s *= 0.5;
+		branch = 0;
+		for (i = 0; i < 3; i++)
+			if (av->pos[i] > ck0[i] + s) {
+				ck0[i] += s;
+				branch |= 1 << i;
+			}
+		at = at->kid + branch;
+	}
+	avh.next = at->alist;		/* order by increasing level */
+	for (ap = &avh; ap->next != NULL; ap = ap->next)
+		if (ap->next->lvl >= av->lvl)
+			break;
+	av->next = ap->next;
+	ap->next = (AMBVAL*)av;
+	at->alist = avh.next;
+}
+
+#endif	/* ! NEWAMB */
+
+/************* FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS ***************/
+
+static void
 initambfile(		/* initialize ambient file */
 	int  cre8
 )
@@ -518,7 +869,7 @@ initambfile(		/* initialize ambient file */
 	static char  *mybuf = NULL;
 
 #ifdef	F_SETLKW
-	aflock(creat ? F_WRLCK : F_RDLCK);
+	aflock(cre8 ? F_WRLCK : F_RDLCK);
 #endif
 	SET_FILE_BINARY(ambfp);
 	if (mybuf == NULL)
@@ -566,10 +917,10 @@ writerr:
 
 static AMBVAL *
 avstore(				/* allocate memory and store aval */
-	register AMBVAL  *aval
+	AMBVAL  *aval
 )
 {
-	register AMBVAL  *av;
+	AMBVAL  *av;
 	double	d;
 
 	if ((av = newambval()) == NULL)
@@ -595,7 +946,7 @@ static AMBTREE  *atfreelist = NULL;	/* free ambient tr
 static AMBTREE *
 newambtree(void)				/* allocate 8 ambient tree structs */
 {
-	register AMBTREE  *atp, *upperlim;
+	AMBTREE  *atp, *upperlim;
 
 	if (atfreelist == NULL) {	/* get more nodes */
 		atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE));
@@ -625,54 +976,13 @@ freeambtree(			/* free 8 ambient tree structs */
 
 
 static void
-avinsert(				/* insert ambient value in our tree */
-	void *av
-)
-{
-	register AMBTREE  *at;
-	register AMBVAL  *ap;
-	AMBVAL  avh;
-	FVECT  ck0;
-	double	s;
-	int  branch;
-	register int  i;
-
-	if (((AMBVAL*)av)->rad <= FTINY)
-		error(CONSISTENCY, "zero ambient radius in avinsert");
-	at = &atrunk;
-	VCOPY(ck0, thescene.cuorg);
-	s = thescene.cusize;
-	while (s*(OCTSCALE/2) > ((AMBVAL*)av)->rad*ambacc) {
-		if (at->kid == NULL)
-			if ((at->kid = newambtree()) == NULL)
-				error(SYSTEM, "out of memory in avinsert");
-		s *= 0.5;
-		branch = 0;
-		for (i = 0; i < 3; i++)
-			if (((AMBVAL*)av)->pos[i] > ck0[i] + s) {
-				ck0[i] += s;
-				branch |= 1 << i;
-			}
-		at = at->kid + branch;
-	}
-	avh.next = at->alist;		/* order by increasing level */
-	for (ap = &avh; ap->next != NULL; ap = ap->next)
-		if (ap->next->lvl >= ((AMBVAL*)av)->lvl)
-			break;
-	((AMBVAL*)av)->next = ap->next;
-	ap->next = (AMBVAL*)av;
-	at->alist = avh.next;
-}
-
-
-static void
 unloadatree(			/* unload an ambient value tree */
-	register AMBTREE  *at,
+	AMBTREE  *at,
 	unloadtf_t *f
 )
 {
-	register AMBVAL  *av;
-	register int  i;
+	AMBVAL  *av;
+	int  i;
 					/* transfer values at this node */
 	for (av = at->alist; av != NULL; av = at->alist) {
 		at->alist = av->next;
@@ -697,8 +1007,14 @@ static int	i_avlist;		/* index for lists */
 static int alatcmp(const void *av1, const void *av2);
 
 static void
+avfree(AMBVAL *av)
+{
+	free(av);
+}
+
+static void
 av2list(
-	void *av
+	AMBVAL *av
 )
 {
 #ifdef DEBUG
@@ -706,7 +1022,7 @@ av2list(
 		error(CONSISTENCY, "too many ambient values in av2list1");
 #endif
 	avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
-	avlist1[i_avlist++].t = ((AMBVAL*)av)->latick;
+	avlist1[i_avlist++].t = av->latick;
 }
 
 
@@ -716,7 +1032,7 @@ alatcmp(			/* compare ambient values for MRA */
 	const void *av2
 )
 {
-	register long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
+	long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
 	return(lc<0 ? -1 : lc>0 ? 1 : 0);
 }
 
@@ -733,30 +1049,26 @@ aposcmp(			/* compare ambient value positions */
 	const void	*avp2
 )
 {
-	register long	diff = *(char * const *)avp1 - *(char * const *)avp2;
+	long	diff = *(char * const *)avp1 - *(char * const *)avp2;
 	if (diff < 0)
 		return(-1);
 	return(diff > 0);
 }
 
-#if 1
+
 static int
 avlmemi(				/* find list position from address */
 	AMBVAL	*avaddr
 )
 {
-	register AMBVAL  **avlpp;
+	AMBVAL  **avlpp;
 
 	avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2,
-			nambvals, sizeof(AMBVAL *), aposcmp);
+			nambvals, sizeof(AMBVAL *), &aposcmp);
 	if (avlpp == NULL)
 		error(CONSISTENCY, "address not found in avlmemi");
 	return(avlpp - avlist2);
 }
-#else
-#define avlmemi(avaddr)	((AMBVAL **)bsearch((char *)&avaddr,(char *)avlist2, \
-				nambvals,sizeof(AMBVAL *),aposcmp) - avlist2)
-#endif
 
 
 static void
@@ -766,7 +1078,7 @@ sortambvals(			/* resort ambient values */
 {
 	AMBTREE  oldatrunk;
 	AMBVAL	tav, *tap, *pnext;
-	register int	i, j;
+	int	i, j;
 					/* see if it's time yet */
 	if (!always && (ambclock++ < lastsort+sortintvl ||
 			nambvals < SORT_THRESH))
@@ -800,7 +1112,7 @@ sortambvals(			/* resort ambient values */
 			oldatrunk = atrunk;
 			atrunk.alist = NULL;
 			atrunk.kid = NULL;
-			unloadatree(&oldatrunk, avinsert);
+			unloadatree(&oldatrunk, &avinsert);
 		}
 	} else {			/* sort memory by last access time */
 		/*
@@ -817,13 +1129,13 @@ sortambvals(			/* resort ambient values */
 		eputs(errmsg);
 #endif
 		i_avlist = 0;
-		unloadatree(&atrunk, av2list);	/* empty current tree */
+		unloadatree(&atrunk, &av2list);	/* empty current tree */
 #ifdef DEBUG
 		if (i_avlist < nambvals)
 			error(CONSISTENCY, "missing ambient values in sortambvals");
 #endif
-		qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp);
-		qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
+		qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp);
+		qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp);
 		for (i = 0; i < nambvals; i++) {
 			if (avlist1[i].p == NULL)
 				continue;
@@ -874,12 +1186,12 @@ aflock(			/* lock/unlock ambient file */
 }
 
 
-extern int
+int
 ambsync(void)			/* synchronize ambient file */
 {
 	long  flen;
 	AMBVAL	avs;
-	register int  n;
+	int  n;
 
 	if (ambfp == NULL)	/* no ambient file? */
 		return(0);
@@ -927,9 +1239,9 @@ seekerr:
 	return -1; /* pro forma return */
 }
 
-#else
+#else	/* ! F_SETLKW */
 
-extern int
+int
 ambsync(void)			/* flush ambient file */
 {
 	if (ambfp == NULL)
@@ -938,4 +1250,4 @@ ambsync(void)			/* flush ambient file */
 	return(fflush(ambfp));
 }
 
-#endif
+#endif	/* ! F_SETLKW */