From 8fea65f73f73645087ac0dfe461ae0f7663a004b Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 16 Apr 2006 17:42:19 +0000
Subject: [PATCH] Don't explicitly dereference function pointers in calls.  No
 functional changes.

---
 src/lib/as/as_extend.c | 3 +--
 src/lib/as/as_hash.c   | 4 ++--
 src/lib/as/as_winnow.c | 9 ++++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/lib/as/as_extend.c b/src/lib/as/as_extend.c
index af82891b..754705ff 100644
--- a/src/lib/as/as_extend.c
+++ b/src/lib/as/as_extend.c
@@ -40,8 +40,7 @@ as_extend(struct as_data *adp)
     head = adp->head;
 
     /* Find the neighboring coordinates. */
-    i = (*adp->neighbor) (head->np->c, adp->neighbor_coords,
-			  adp->userdata);
+    i = adp->neighbor(head->np->c, adp->neighbor_coords, adp->userdata);
     if (i == 0)
 	return NULL;
     /*
diff --git a/src/lib/as/as_hash.c b/src/lib/as/as_hash.c
index 8fa87382..ba34bc0c 100644
--- a/src/lib/as/as_hash.c
+++ b/src/lib/as/as_hash.c
@@ -34,7 +34,7 @@ as_iscinq(struct as_data *adp, struct as_coord c)
     int hashval;
     struct as_hash *hp;
 
-    hashval = (*adp->hash) (c) % adp->hashsize;
+    hashval = adp->hash(c) % adp->hashsize;
 
     for (hp = adp->hashtab[hashval]; hp; hp = hp->next)
 	if (hp->c.x == c.x && hp->c.y == c.y)
@@ -57,7 +57,7 @@ as_setcinq(struct as_data *adp, struct as_coord c, struct as_queue *qp)
     new->c = c;
     new->qp = qp;
 
-    hashval = (*adp->hash) (c) % adp->hashsize;
+    hashval = adp->hash(c) % adp->hashsize;
     hp = adp->hashtab[hashval];
 
     new->next = (hp) ? hp : NULL;
diff --git a/src/lib/as/as_winnow.c b/src/lib/as/as_winnow.c
index 33a670e1..839b19b4 100644
--- a/src/lib/as/as_winnow.c
+++ b/src/lib/as/as_winnow.c
@@ -59,8 +59,7 @@ as_winnow(struct as_data *adp, struct as_coord *coords, int ncoords)
 
     for (cp = coords, end = coords + ncoords; cp < end; cp++) {
 	fix_pointer = 0;
-	incknowncost = (*adp->realcost) (adp->head->np->c, *cp,
-					 adp->userdata);
+	incknowncost = adp->realcost(adp->head->np->c, *cp, adp->userdata);
 	knowncost = adp->head->np->knowncost + incknowncost;
 	/*
 	 * If this neighbor is already in the queue, we can
@@ -68,7 +67,7 @@ as_winnow(struct as_data *adp, struct as_coord *coords, int ncoords)
 	 */
 	qp = as_iscinq(adp, *cp);
 	inclbcost = qp ? qp->np->inclbcost :
-	    (*adp->lbcost) (*cp, adp->to, adp->userdata);
+	    adp->lbcost(*cp, adp->to, adp->userdata);
 	if (inclbcost < 0.0)	/* skip bad cases */
 	    continue;
 	lbcost = knowncost + inclbcost;
@@ -133,8 +132,8 @@ as_winnow(struct as_data *adp, struct as_coord *coords, int ncoords)
 	if (qp)
 	    seccost = qp->np->seccost;
 	else
-	    seccost = (adp->seccost) ?
-		(*adp->seccost) (*cp, adp->to, adp->userdata) : 0.0;
+	    seccost = adp->seccost ?
+		adp->seccost(*cp, adp->to, adp->userdata) : 0.0;
 	np = as_newnode(adp->head->np, *cp, inclbcost, lbcost,
 			knowncost, seccost);
 	if (np == NULL)