Don't explicitly dereference function pointers in calls. No

functional changes.

diff --git a/src/lib/as/as_extend.c b/src/lib/as/as_extend.c
index af82891ba77ebb9cb74685e345e31e4a04a4d016..754705ff412c27afc897c69fb9e2f8e667d025c4 100644 (file)
--- 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 8fa873825bf55def337393c17d38ceb697ebcc3c..ba34bc0c5e9f0820e7b917f29c51e0dc83e233db 100644 (file)
--- 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 33a670e18b3e052cb74d59362d904617d22da29a..839b19b433fbc6f837cc111e67a3da6bd5b7eec2 100644 (file)
--- 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)