cdt: [nfc] remove unnecessary dereference and parens on function pointers

The compiler knows how to call through a function pointer without requiring the
programmer to manually dereference it.

diff --git a/lib/cdt/dtclose.c b/lib/cdt/dtclose.c
index e4208f165efd9389f98bda28ddf2d2aae3a369ea..99cb49bf195baf3654e0495f61a71de847ca17d0 100644 (file)
--- a/lib/cdt/dtclose.c
+++ b/lib/cdt/dtclose.c
@@ -15,30 +15,29 @@ int dtclose(Dt_t* dt)
 
        /* announce the close event to see if we should continue */
        disc = dt->disc;
-       if(disc->eventf &&
-          (ev = (*disc->eventf)(dt,DT_CLOSE,NULL,disc)) < 0)
+       if (disc->eventf && (ev = disc->eventf(dt,DT_CLOSE,NULL,disc)) < 0)
                return -1;
 
        if(dt->view)    /* turn off viewing */
                dtview(dt,NULL);
 
        if(ev == 0) /* release all allocated data */
-       {       (void)(*(dt->meth->searchf))(dt,NULL,DT_CLEAR);
+       {       (void)dt->meth->searchf(dt, NULL, DT_CLEAR);
                if(dtsize(dt) > 0)
                        return -1;
 
                if(dt->data->ntab > 0)
-                       (*dt->memoryf)(dt, dt->data->htab, 0, disc);
-               (*dt->memoryf)(dt, dt->data, 0, disc);
+                       dt->memoryf(dt, dt->data->htab, 0, disc);
+               dt->memoryf(dt, dt->data, 0, disc);
        }
 
        if(dt->type == DT_MALLOC)
                free(dt);
        else if(ev == 0 && dt->type == DT_MEMORYF)
-               (*dt->memoryf)(dt, dt, 0, disc);
+               dt->memoryf(dt, dt, 0, disc);
 
        if(disc->eventf)
-               (void)(*disc->eventf)(dt, DT_ENDCLOSE, NULL, disc);
+               (void)disc->eventf(dt, DT_ENDCLOSE, NULL, disc);
 
        return 0;
 }

diff --git a/lib/cdt/dtdisc.c b/lib/cdt/dtdisc.c
index 12f340baf84c954159e16cb72eeb8c113f87a91b..8c4f7fdcc3a8bbd1785a882bfb600ba4d42c10b6 100644 (file)
--- a/lib/cdt/dtdisc.c
+++ b/lib/cdt/dtdisc.c
@@ -43,7 +43,7 @@ Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type)
 
        UNFLATTEN(dt);
 
-       if(old->eventf && (*old->eventf)(dt, DT_DISC, disc, old) < 0)
+       if (old->eventf && old->eventf(dt, DT_DISC, disc, old) < 0)
                return NULL;
 
        dt->disc = disc;
@@ -86,7 +86,7 @@ Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type)
                                k = _DTKEY(k, disc->key, disc->size);
                                r->hash = _DTHSH(dt,k,disc,disc->size);
                        }
-                       (void)(*searchf)(dt, r, DT_RENEW);
+                       (void)searchf(dt, r, DT_RENEW);
                        r = t;
                }
        }

diff --git a/lib/cdt/dthash.c b/lib/cdt/dthash.c
index 4c1869ee7afb7d72bd9886c84b9deb0bea68f8a2..e3425f9695c8943fb18b98ae1a34a2aab8861b48 100644 (file)
--- a/lib/cdt/dthash.c
+++ b/lib/cdt/dthash.c
@@ -21,7 +21,7 @@ static void dthtab(Dt_t* dt)
 
        n = dt->data->ntab;
        if(dt->disc && dt->disc->eventf &&
-          (*dt->disc->eventf)(dt, DT_HASHSIZE, &n, dt->disc) > 0 )
+          dt->disc->eventf(dt, DT_HASHSIZE, &n, dt->disc) > 0)
        {       if(n < 0) /* fix table size */
                {       dt->data->minp = 1;
                        if(dt->data->ntab > 0 )
@@ -47,7 +47,7 @@ static void dthtab(Dt_t* dt)
 
        /* allocate new table */
        olds = dt->data->ntab == 0 ? NULL : dt->data->htab;
-       if(!(s = (*dt->memoryf)(dt, olds, n * sizeof(Dtlink_t*), dt->disc)) )
+       if (!(s = dt->memoryf(dt, olds, n * sizeof(Dtlink_t*), dt->disc)))
                return;
        olds = s + dt->data->ntab;
        dt->data->htab = s;
@@ -105,9 +105,9 @@ static void* dthash(Dt_t* dt, void* obj, int type)
                                while(t)
                                {       r = t->right;
                                        if(disc->freef)
-                                               (*disc->freef)(dt,_DTOBJ(t,lk),disc);
+                                               disc->freef(dt, _DTOBJ(t, lk), disc);
                                        if(disc->link < 0)
-                                               (*dt->memoryf)(dt, t, 0, disc);
+                                               dt->memoryf(dt, t, 0, disc);
                                        t = r;
                                }
                        }
@@ -204,18 +204,17 @@ static void* dthash(Dt_t* dt, void* obj, int type)
                        return _DTOBJ(t,lk);
                }
 
-               if(disc->makef && (type&DT_INSERT) &&
-                  !(obj = (*disc->makef)(dt,obj,disc)) )
+               if (disc->makef && (type&DT_INSERT) && !(obj = disc->makef(dt, obj, disc)))
                        return NULL;
                if(lk >= 0)
                        r = _DTLNK(obj,lk);
                else
-               {       r = (*dt->memoryf)(dt, NULL, sizeof(Dthold_t), disc);
+               {       r = dt->memoryf(dt, NULL, sizeof(Dthold_t), disc);
                        if(r)
                                ((Dthold_t*)r)->obj = obj;
                        else
                        {       if(disc->makef && disc->freef && (type&DT_INSERT))
-                                       (*disc->freef)(dt,obj,disc);
+                                       disc->freef(dt, obj, disc);
                                return NULL;
                        }
                }
@@ -228,9 +227,9 @@ static void* dthash(Dt_t* dt, void* obj, int type)
                if(dt->data->ntab == 0)
                {       dt->data->size -= 1;
                        if(disc->freef && (type&DT_INSERT))
-                               (*disc->freef)(dt,obj,disc);
+                               disc->freef(dt,obj,disc);
                        if(disc->link < 0)
-                               (*disc->memoryf)(dt, r, 0, disc);
+                               disc->memoryf(dt, r, 0, disc);
                        return NULL;
                }
                s = dt->data->htab + HINDEX(dt->data->ntab,hsh);
@@ -289,9 +288,9 @@ static void* dthash(Dt_t* dt, void* obj, int type)
                        goto do_insert;
                else
                {       if(disc->freef)
-                               (*disc->freef)(dt,obj,disc);
+                               disc->freef(dt, obj, disc);
                        if(disc->link < 0)
-                               (*dt->memoryf)(dt, r, 0, disc);
+                               dt->memoryf(dt, r, 0, disc);
                        return t ? _DTOBJ(t,lk) : NULL;
                }
        }
@@ -313,9 +312,9 @@ static void* dthash(Dt_t* dt, void* obj, int type)
                dt->data->size -= 1;
                dt->data->here = p;
                if(disc->freef && (type&DT_DELETE))
-                       (*disc->freef)(dt,obj,disc);
+                       disc->freef(dt, obj, disc);
                if(disc->link < 0)
-                       (*dt->memoryf)(dt, t, 0, disc);
+                       dt->memoryf(dt, t, 0, disc);
                return obj;
        }
 }

diff --git a/lib/cdt/dtlist.c b/lib/cdt/dtlist.c
index 7476b7020e85594e33c4262f6e45ebc6041dbd8b..1308d2fe9b5b58b49c571c9aa3c714c39d6449c8 100644 (file)
--- a/lib/cdt/dtlist.c
+++ b/lib/cdt/dtlist.c
@@ -37,9 +37,9 @@ static void* dtlist(Dt_t* dt, void* obj, int type)
                        {       for(r = dt->data->head; r; r = t)
                                {       t = r->right;
                                        if(disc->freef)
-                                               (*disc->freef)(dt,_DTOBJ(r,lk),disc);
+                                               disc->freef(dt, _DTOBJ(r, lk), disc);
                                        if(disc->link < 0)
-                                               (*dt->memoryf)(dt, r, 0, disc);
+                                               dt->memoryf(dt, r, 0, disc);
                                }
                        }
                        dt->data->head = dt->data->here = NULL;
@@ -50,18 +50,17 @@ static void* dtlist(Dt_t* dt, void* obj, int type)
        }
 
        if(type&(DT_INSERT|DT_ATTACH))
-       {       if(disc->makef && (type&DT_INSERT) &&
-                  !(obj = (*disc->makef)(dt,obj,disc)) )
+       {       if (disc->makef && (type&DT_INSERT) && !(obj = disc->makef(dt, obj, disc)))
                        return NULL;
                if(lk >= 0)
                        r = _DTLNK(obj,lk);
                else
-               {       r = (*dt->memoryf)(dt, NULL, sizeof(Dthold_t), disc);
+               {       r = dt->memoryf(dt, NULL, sizeof(Dthold_t), disc);
                        if(r)
                                ((Dthold_t*)r)->obj = obj;
                        else
                        {       if(disc->makef && disc->freef && (type&DT_INSERT))
-                                       (*disc->freef)(dt,obj,disc);
+                                       disc->freef(dt, obj, disc);
                                return NULL;
                        }
                }
@@ -153,9 +152,9 @@ static void* dtlist(Dt_t* dt, void* obj, int type)
 
                obj = _DTOBJ(r,lk);
                if(disc->freef && (type&DT_DELETE))
-                       (*disc->freef)(dt,obj,disc);
+                       disc->freef(dt, obj, disc);
                if(disc->link < 0)
-                       (*dt->memoryf)(dt, r, 0, disc);
+                       dt->memoryf(dt, r, 0, disc);
                return obj;
        }
        else if(type&DT_NEXT)

diff --git a/lib/cdt/dtmethod.c b/lib/cdt/dtmethod.c
index 3fba892ee9a214c29bf156c738dd234e629a4097..893edb638bcc4580e331dc0381d9182b70ee7411 100644 (file)
--- a/lib/cdt/dtmethod.c
+++ b/lib/cdt/dtmethod.c
@@ -15,8 +15,7 @@ Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth)
        if(!meth || meth->type == oldmeth->type)
                return oldmeth;
 
-       if(disc->eventf &&
-          (*disc->eventf)(dt, DT_METH, meth, disc) < 0)
+       if (disc->eventf && disc->eventf(dt, DT_METH, meth, disc) < 0)
                return NULL;
 
        dt->data->minp = 0;
@@ -28,7 +27,7 @@ Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth)
                dt->data->head = NULL;
        else if(dt->data->type&(DT_SET|DT_BAG) )
        {       if(dt->data->ntab > 0)
-                       (*dt->memoryf)(dt, dt->data->htab, 0, disc);
+                       dt->memoryf(dt, dt->data->htab, 0, disc);
                dt->data->ntab = 0;
                dt->data->htab = NULL;
        }
@@ -54,7 +53,7 @@ Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth)
        {       dt->data->size = 0;
                while(list)
                {       r = list->right;
-                       (*meth->searchf)(dt, list, DT_RENEW);
+                       meth->searchf(dt, list, DT_RENEW);
                        list = r;
                }
        }
@@ -72,7 +71,7 @@ Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth)
                                key = _DTKEY(key,disc->key,disc->size);
                                list->hash = _DTHSH(dt,key,disc,disc->size);
                        }
-                       (void)(*meth->searchf)(dt, list, DT_RENEW);
+                       (void)meth->searchf(dt, list, DT_RENEW);
                        list = r;
                }
        }

diff --git a/lib/cdt/dtopen.c b/lib/cdt/dtopen.c
index 5bae1b75c4985fa408f0f2b0d61a7212ca2904f2..939597a0317d14126c4a78f3d01a06ae7860eb58 100644 (file)
--- a/lib/cdt/dtopen.c
+++ b/lib/cdt/dtopen.c
@@ -32,7 +32,7 @@ Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth)
        if(disc->eventf)
        {       /* if shared/persistent dictionary, get existing data */
                data = NULL;
-               if((e = (*disc->eventf)(dt, DT_OPEN, &data, disc)) < 0)
+               if ((e = disc->eventf(dt, DT_OPEN, &data, disc)) < 0)
                        goto err_open;
                else if(e > 0)
                {       if(data)
@@ -45,7 +45,7 @@ Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth)
                                goto err_open;
 
                        free(dt);
-                       if(!(dt = (*disc->memoryf)(0, 0, sizeof(Dt_t), disc)) )
+                       if (!(dt = disc->memoryf(0, 0, sizeof(Dt_t), disc)))
                                return NULL;
                        dt->searchf = NULL;
                        dt->meth = NULL;
@@ -58,7 +58,7 @@ Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth)
        }
 
        /* allocate sharable data */
-       if(!(data = (dt->memoryf)(dt, NULL, sizeof(Dtdata_t), disc)) )
+       if (!(data = dt->memoryf(dt, NULL, sizeof(Dtdata_t), disc)))
        { err_open:
                free(dt);
                return NULL;

diff --git a/lib/cdt/dtrenew.c b/lib/cdt/dtrenew.c
index 5557b2751666050d0eb835be174b556bdeff05b5..fba07fc1c50233d8c41f4ec8d747f2e8ee227206 100644 (file)
--- a/lib/cdt/dtrenew.c
+++ b/lib/cdt/dtrenew.c
@@ -48,5 +48,5 @@ void* dtrenew(Dt_t* dt, void* obj)
        }
 
        dt->data->size -= 1;
-       return (*dt->meth->searchf)(dt, e, DT_RENEW) ? obj : NULL;
+       return dt->meth->searchf(dt, e, DT_RENEW) ? obj : NULL;
 }

diff --git a/lib/cdt/dtrestore.c b/lib/cdt/dtrestore.c
index 40049f4ccb19c6e98362e3d302e2342b921411a7..46a7d37b47ec461f501d8f8f7eb8635804ac9683 100644 (file)
--- a/lib/cdt/dtrestore.c
+++ b/lib/cdt/dtrestore.c
@@ -42,7 +42,7 @@ int dtrestore(Dt_t* dt, Dtlink_t* list)
                {       dt->data->size = 0;
                        while(list)
                        {       t = list->right;
-                               (*searchf)(dt, list, DT_RENEW);
+                               searchf(dt, list, DT_RENEW);
                                list = t;
                        }
                }

diff --git a/lib/cdt/dttree.c b/lib/cdt/dttree.c
index 0f66358a20add599e2d53c9c29caf705d8f649e6..3cc85a3cc202764059405739356f3389fbf08e1d 100644 (file)
--- a/lib/cdt/dttree.c
+++ b/lib/cdt/dttree.c
@@ -35,9 +35,9 @@ static void* dttree(Dt_t* dt, void* obj, int type)
                                                RROTATE(root,t);
                                        t = root->right;
                                        if(disc->freef)
-                                               (*disc->freef)(dt,_DTOBJ(root,lk),disc);
+                                               disc->freef(dt, _DTOBJ(root, lk), disc);
                                        if(disc->link < 0)
-                                               (*dt->memoryf)(dt, root, 0, disc);
+                                               dt->memoryf(dt, root, 0, disc);
                                } while((root = t) );
                        }
 
@@ -259,9 +259,9 @@ static void* dttree(Dt_t* dt, void* obj, int type)
                dt_delete:
                        obj = _DTOBJ(root,lk);
                        if(disc->freef && (type&DT_DELETE))
-                               (*disc->freef)(dt,obj,disc);
+                               disc->freef(dt, obj, disc);
                        if(disc->link < 0)
-                               (*dt->memoryf)(dt, root, 0, disc);
+                               dt->memoryf(dt, root, 0, disc);
                        if((dt->data->size -= 1) < 0)
                                dt->data->size = -1;
                        goto no_root;
@@ -279,9 +279,9 @@ static void* dttree(Dt_t* dt, void* obj, int type)
                else if(type&DT_RENEW) /* a duplicate */
                {       if(dt->meth->type&DT_OSET)
                        {       if(disc->freef)
-                                       (*disc->freef)(dt,obj,disc);
+                                       disc->freef(dt, obj, disc);
                                if(disc->link < 0)
-                                       (*dt->memoryf)(dt, me, 0, disc);
+                                       dt->memoryf(dt, me, 0, disc);
                        }
                        else
                        {       me->left = NULL;
@@ -312,17 +312,17 @@ static void* dttree(Dt_t* dt, void* obj, int type)
                else if(type&(DT_INSERT|DT_ATTACH))
                { dt_insert:
                        if(disc->makef && (type&DT_INSERT))
-                               obj = (*disc->makef)(dt,obj,disc);
+                               obj = disc->makef(dt, obj, disc);
                        if(obj)
                        {       if(lk >= 0)
                                        root = _DTLNK(obj,lk);
                                else
-                               {       root = (*dt->memoryf)(dt, NULL, sizeof(Dthold_t), disc);
+                               {       root = dt->memoryf(dt, NULL, sizeof(Dthold_t), disc);
                                        if(root)
                                                ((Dthold_t*)root)->obj = obj;
                                        else if(disc->makef && disc->freef &&
                                                (type&DT_INSERT))
-                                               (*disc->freef)(dt,obj,disc);
+                                               disc->freef(dt, obj, disc);
                                }
                        }
                        if(root)

diff --git a/lib/cdt/dtview.c b/lib/cdt/dtview.c
index bf54664e6e5c30afbdb68c02e4becc38cb154ed3..bbe6058faa1732c70ba38fe36d37ee2daede91ee 100644 (file)
--- a/lib/cdt/dtview.c
+++ b/lib/cdt/dtview.c
@@ -22,7 +22,7 @@ static void* dtvsearch(Dt_t* dt, void* obj, int type)
        if((type&(DT_MATCH|DT_SEARCH)) || /* order sets first/last done below */
           ((type&(DT_FIRST|DT_LAST)) && !(dt->meth->type&(DT_OBAG|DT_OSET)) ) )
        {       for(d = dt; d; d = d->view)
-                       if((o = (*(d->meth->searchf))(d,obj,type)) )
+                       if ((o = d->meth->searchf(d, obj, type)))
                                break;
                dt->walk = d;
                return o;
@@ -34,7 +34,7 @@ static void* dtvsearch(Dt_t* dt, void* obj, int type)
 
                n = nk = NULL; p = NULL;
                for(d = dt; d; d = d->view)
-               {       if(!(o = (*d->meth->searchf)(d, obj, type)) )
+               {       if (!(o = d->meth->searchf(d, obj, type)))
                                continue;
                        _DTDSC(d->disc,ky,sz,lk,cmpf);
                        ok = _DTKEY(o,ky,sz);
@@ -62,29 +62,29 @@ static void* dtvsearch(Dt_t* dt, void* obj, int type)
 
        if(!dt->walk || obj != _DTOBJ(dt->walk->data->here, dt->walk->disc->link) )
        {       for(d = dt; d; d = d->view)
-                       if((o = (*(d->meth->searchf))(d, obj, DT_SEARCH)) )
+                       if ((o = d->meth->searchf(d, obj, DT_SEARCH)))
                                break;
                dt->walk = d;
                if(!(obj = o) )
                        return NULL;
        }
 
-       for(d = dt->walk, obj = (*d->meth->searchf)(d, obj, type);; )
+       for (d = dt->walk, obj = d->meth->searchf(d, obj, type);; )
        {       while(obj) /* keep moving until finding an uncovered object */
                {       for(p = dt; ; p = p->view)
                        {       if(p == d) /* adjacent object is uncovered */   
                                        return obj;
-                               if((*(p->meth->searchf))(p, obj, DT_SEARCH) )
+                               if (p->meth->searchf(p, obj, DT_SEARCH))
                                        break;
                        }
-                       obj = (*d->meth->searchf)(d, obj, type);
+                       obj = d->meth->searchf(d, obj, type);
                }
 
                if(!(d = dt->walk = d->view) ) /* move on to next dictionary */
                        return NULL;
                else if(type&DT_NEXT)
-                       obj = (*(d->meth->searchf))(d,NULL,DT_FIRST);
-               else    obj = (*(d->meth->searchf))(d,NULL,DT_LAST);
+                       obj = d->meth->searchf(d, NULL, DT_FIRST);
+               else    obj = d->meth->searchf(d, NULL, DT_LAST);
        }
 }
 

diff --git a/lib/cdt/dtwalk.c b/lib/cdt/dtwalk.c
index 9cb172d2bf30d2322e1d20c45986b2daeb84028c..e79067d20f927e4699f3e7b546cc847aba5f2ec3 100644 (file)
--- a/lib/cdt/dtwalk.c
+++ b/lib/cdt/dtwalk.c
@@ -16,7 +16,7 @@ int dtwalk(Dt_t* dt, int (*userf)(Dt_t*, void*, void*), void* data)
        {       if(!(walk = dt->walk) )
                        walk = dt;
                next = dtnext(dt,obj);
-               if((rv = (*userf)(walk, obj, data )) < 0)
+               if ((rv = userf(walk, obj, data )) < 0)
                        return rv;
                obj = next;
        }