Removed old-style function defintions from lib/cdt

The functions definitions in cdt are all surrounded by an `#if __STD_C`, if __STD_C is not defined than the old style function definition is used. These days STD C is the standard and the old style function defintions are obsolete.
They have been removed from lib/cdt, but not from the subprojects.

diff --git a/lib/cdt/dtclose.c b/lib/cdt/dtclose.c
index fec6e3180f80bfae2067bdd821a8fe7e806b8259..8eff06e5ff43c0bb84baf86b6850ceb137fa05d3 100644 (file)
--- a/lib/cdt/dtclose.c
+++ b/lib/cdt/dtclose.c
@@ -4,12 +4,7 @@
 **
 **     Written by Kiem-Phong Vo (05/25/96)
 */
-#if __STD_C
 int dtclose(reg Dt_t* dt)
-#else
-int dtclose(dt)
-reg Dt_t*      dt;
-#endif
 {
        Dtdisc_t        *disc;
        int             ev = 0;

diff --git a/lib/cdt/dtdisc.c b/lib/cdt/dtdisc.c
index 2b022c0475ce3c5d3a7eeae5846ec8d47aaa459a..5a07bbcdfe73fc9862a6672c04d8612d30295b8b 100644 (file)
--- a/lib/cdt/dtdisc.c
+++ b/lib/cdt/dtdisc.c
@@ -7,15 +7,7 @@
 **     Written by Kiem-Phong Vo (5/26/96)
 */
 
-#if __STD_C
 static Void_t* dtmemory(Dt_t* dt,Void_t* addr,size_t size,Dtdisc_t* disc)
-#else
-static Void_t* dtmemory(dt, addr, size, disc)
-Dt_t*          dt;     /* dictionary                   */
-Void_t*        addr;   /* address to be manipulate     */
-size_t         size;   /* size to obtain               */
-Dtdisc_t*      disc;   /* discipline                   */
-#endif
 {
        if(addr)
        {       if(size == 0)
@@ -27,14 +19,7 @@ Dtdisc_t*    disc;   /* discipline                   */
        else    return size > 0 ? malloc(size) : NIL(Void_t*);
 }
 
-#if __STD_C
 Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type)
-#else
-Dtdisc_t* dtdisc(dt,disc,type)
-Dt_t*          dt;
-Dtdisc_t*      disc;
-int            type;
-#endif
 {
        reg Dtsearch_f  searchf;
        reg Dtlink_t    *r, *t;

diff --git a/lib/cdt/dtextract.c b/lib/cdt/dtextract.c
index 84d2a680262af7dee488e6701abc207a4c42d6e7..b6465cdc06a8dc605920a843947c329ef12986ed 100644 (file)
--- a/lib/cdt/dtextract.c
+++ b/lib/cdt/dtextract.c
@@ -5,12 +5,7 @@
 **     Written by Kiem-Phong Vo (5/25/96).
 */
 
-#if __STD_C
 Dtlink_t* dtextract(reg Dt_t* dt)
-#else
-Dtlink_t* dtextract(dt)
-reg Dt_t*      dt;
-#endif
 {
        reg Dtlink_t    *list, **s, **ends;
 

diff --git a/lib/cdt/dtflatten.c b/lib/cdt/dtflatten.c
index fb016a34ce7e4f2a1abfb16f9bd116cb9906ec46..b484cb3ff5a131c891f3a8445fd3cb5982e32264 100644 (file)
--- a/lib/cdt/dtflatten.c
+++ b/lib/cdt/dtflatten.c
@@ -6,12 +6,7 @@
 **     Written by Kiem-Phong Vo (5/25/96).
 */
 
-#if __STD_C
 Dtlink_t* dtflatten(Dt_t* dt)
-#else
-Dtlink_t* dtflatten(dt)
-Dt_t*  dt;
-#endif
 {
        reg Dtlink_t    *t, *r, *list, *last, **s, **ends;
 

diff --git a/lib/cdt/dthash.c b/lib/cdt/dthash.c
index 7c7c151f2089f02ad3e8ee44639fec09e27148f5..ac5359f48711f4e5f90116fb66bdb2523e06f331 100644 (file)
--- a/lib/cdt/dthash.c
+++ b/lib/cdt/dthash.c
@@ -9,12 +9,7 @@
 */
 
 /* resize the hash table */
-#if __STD_C
 static void dthtab(Dt_t* dt)
-#else
-static void dthtab(dt)
-Dt_t*  dt;
-#endif
 {
        reg Dtlink_t    *t, *r, *p, **s, **hs, **is, **olds;
        int             n, k;
@@ -75,14 +70,7 @@ Dt_t*        dt;
        }
 }
 
-#if __STD_C
 static Void_t* dthash(Dt_t* dt, reg Void_t* obj, int type)
-#else
-static Void_t* dthash(dt,obj,type)
-Dt_t*          dt;
-reg Void_t*    obj;
-int            type;
-#endif
 {
        reg Dtlink_t    *t, *r = NULL, *p;
        reg Void_t      *k, *key;

diff --git a/lib/cdt/dtlist.c b/lib/cdt/dtlist.c
index c9658ef5bdc3e4de0b63d0cf04fc22f0a8c66c5f..1ed726b53ace88dec323fcb92196d9aad83c0d8e 100644 (file)
--- a/lib/cdt/dtlist.c
+++ b/lib/cdt/dtlist.c
@@ -5,14 +5,7 @@
 **     Written by Kiem-Phong Vo (05/25/96)
 */
 
-#if __STD_C
 static Void_t* dtlist(reg Dt_t* dt, reg Void_t* obj, reg int type)
-#else
-static Void_t* dtlist(dt, obj, type)
-reg Dt_t*      dt;
-reg Void_t*    obj;
-reg int                type;
-#endif
 {
        reg int         lk, sz, ky;
        reg Dtcompar_f  cmpf;

diff --git a/lib/cdt/dtmethod.c b/lib/cdt/dtmethod.c
index e93d626b7deb8807721da30e07038a7cd0cea054..9e3d11ba57b30f0c0e2efeaeaf7384d848328ad1 100644 (file)
--- a/lib/cdt/dtmethod.c
+++ b/lib/cdt/dtmethod.c
@@ -5,13 +5,7 @@
 **     Written by Kiem-Phong Vo (05/25/96)
 */
 
-#if __STD_C
 Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth)
-#else
-Dtmethod_t* dtmethod(dt, meth)
-Dt_t*          dt;
-Dtmethod_t*    meth;
-#endif
 {
        reg Dtlink_t    *list, *r;
        reg Dtdisc_t*   disc = dt->disc;

diff --git a/lib/cdt/dtopen.c b/lib/cdt/dtopen.c
index 6f342137247d4ff3cfc5d9898738f4dc6a9b053b..e750a464321c5f1a4305977bf4a1fe7371e8bc80 100644 (file)
--- a/lib/cdt/dtopen.c
+++ b/lib/cdt/dtopen.c
@@ -6,13 +6,7 @@ static char*     Version = "\n@(#)$Id$\0\n";
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth)
-#else
-Dt_t*  dtopen(disc, meth)
-Dtdisc_t*      disc;
-Dtmethod_t*    meth;
-#endif
 {
        Dt_t*           dt = (Dt_t*)Version;    /* shut-up unuse warning */
        reg int         e;

diff --git a/lib/cdt/dtrenew.c b/lib/cdt/dtrenew.c
index a143013d596e251c50dcf28afab904df73e41706..d51fff2c1bdcaad2b8e676e6691b8978bc8c321d 100644 (file)
--- a/lib/cdt/dtrenew.c
+++ b/lib/cdt/dtrenew.c
@@ -6,13 +6,7 @@
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 Void_t* dtrenew(Dt_t* dt, reg Void_t* obj)
-#else
-Void_t* dtrenew(dt, obj)
-Dt_t*          dt;
-reg Void_t*    obj;
-#endif
 {
        reg Void_t*     key;
        reg Dtlink_t    *e, *t, **s;

diff --git a/lib/cdt/dtrestore.c b/lib/cdt/dtrestore.c
index d57f07b61774ab723e854aac97607b5c691a18d4..1564f74c942457e6f7ca2bbfc5031b966df94a47 100644 (file)
--- a/lib/cdt/dtrestore.c
+++ b/lib/cdt/dtrestore.c
@@ -7,13 +7,7 @@
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 int dtrestore(reg Dt_t* dt, reg Dtlink_t* list)
-#else
-int dtrestore(dt, list)
-reg Dt_t*      dt;
-reg Dtlink_t*  list;
-#endif
 {
        reg Dtlink_t    *t, **s, **ends;
        reg int         type;

diff --git a/lib/cdt/dtsize.c b/lib/cdt/dtsize.c
index bd3a65550880d5e9de70320e7cd0fa56fe617f16..18f04164d0300438a0ed0d599b49da20d34fa436 100644 (file)
--- a/lib/cdt/dtsize.c
+++ b/lib/cdt/dtsize.c
@@ -5,21 +5,11 @@
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 static int treecount(reg Dtlink_t* e)
-#else
-static int treecount(e)
-reg Dtlink_t*  e;
-#endif
 {      return e ? treecount(e->left) + treecount(e->right) + 1 : 0;
 }
 
-#if __STD_C
 int dtsize(Dt_t* dt)
-#else
-int dtsize(dt)
-Dt_t*  dt;
-#endif
 {
        reg Dtlink_t*   t;
        reg int         size;

diff --git a/lib/cdt/dtstat.c b/lib/cdt/dtstat.c
index ac2e95da22bc5bf0b34efbcfa87e6d547dde2ce2..dbe7ce57336a92def8b67a1f8755e450ae52efe2 100644 (file)
--- a/lib/cdt/dtstat.c
+++ b/lib/cdt/dtstat.c
@@ -5,15 +5,7 @@
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 static void dttstat(Dtstat_t* ds, Dtlink_t* root, int depth, int* level)
-#else
-static void dttstat(ds,root,depth,level)
-Dtstat_t*      ds;
-Dtlink_t*      root;
-int            depth;
-int*           level;
-#endif
 {
        if(root->left)
                dttstat(ds,root->left,depth+1,level);
@@ -25,14 +17,7 @@ int*         level;
                level[depth] += 1;
 }
 
-#if __STD_C
 static void dthstat(reg Dtdata_t* data, Dtstat_t* ds, reg int* count)
-#else
-static void dthstat(data, ds, count)
-reg Dtdata_t*  data;
-Dtstat_t*      ds;
-reg int*       count;
-#endif
 {
        reg Dtlink_t*   t;
        reg int         n, h;
@@ -51,14 +36,7 @@ reg int*     count;
        }
 }
 
-#if __STD_C
 int dtstat(reg Dt_t* dt, Dtstat_t* ds, int all)
-#else
-int dtstat(dt, ds, all)
-reg Dt_t*      dt;
-Dtstat_t*      ds;
-int            all;
-#endif
 {
        reg int         i;
        static int      *Count, Size;

diff --git a/lib/cdt/dtstrhash.c b/lib/cdt/dtstrhash.c
index 13b3f1af1470413d0408b39be90d2b46af55ef0d..c50c20c89e061b0dfb40dbde76f02ead2bb3425b 100644 (file)
--- a/lib/cdt/dtstrhash.c
+++ b/lib/cdt/dtstrhash.c
@@ -13,14 +13,7 @@
 ** Written by Kiem-Phong Vo (02/28/03)
 */
 
-#if __STD_C
 uint dtstrhash(reg uint h, Void_t* args, reg int n)
-#else
-uint dtstrhash(h,args,n)
-reg uint       h;
-Void_t*                args;
-reg int                n;
-#endif
 {
        reg unsigned char*      s = (unsigned char*)args;
 

diff --git a/lib/cdt/dttree.c b/lib/cdt/dttree.c
index 5e891cb759ff533f610b62ffd286a6ba6ba7d098..87b2f0e3816b8b156c5db1a06fc490b5723e548b 100644 (file)
--- a/lib/cdt/dttree.c
+++ b/lib/cdt/dttree.c
@@ -8,14 +8,7 @@
 **      Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 static Void_t* dttree(Dt_t* dt, Void_t* obj, int type)
-#else
-static Void_t* dttree(dt,obj,type)
-Dt_t*          dt;
-Void_t*        obj;
-int            type;
-#endif
 {
        Dtlink_t        *root, *t;
        int             cmp, lk, sz, ky;

diff --git a/lib/cdt/dttreeset.c b/lib/cdt/dttreeset.c
index 13ad8afec81080f831282c9e0df98df7aa3d9b20..4a73b980146f2ec35375c7b90c8b4b91f70f0f41 100644 (file)
--- a/lib/cdt/dttreeset.c
+++ b/lib/cdt/dttreeset.c
@@ -5,13 +5,7 @@
 ** Written by Kiem-Phong Vo (09/17/2001)
 */
 
-#if __STD_C
 static Dtlink_t* treebalance(Dtlink_t* list, int size)
-#else
-static Dtlink_t* treebalance(list, size)
-Dtlink_t*      list;
-int            size;
-#endif
 {
        int             n;
        Dtlink_t        *l, *mid;
@@ -28,14 +22,7 @@ int          size;
        return mid;
 }
 
-#if __STD_C
 int dttreeset(Dt_t* dt, int minp, int balance)
-#else
-int dttreeset(dt, minp, balance)
-Dt_t*  dt;
-int    minp;
-int    balance;
-#endif
 {
        int     size;
 

diff --git a/lib/cdt/dtview.c b/lib/cdt/dtview.c
index ea099887a10dc9fc5d0804514996745e55606379..dc348fc534ff2124c12a2d790e39acb914bd1fae 100644 (file)
--- a/lib/cdt/dtview.c
+++ b/lib/cdt/dtview.c
@@ -6,14 +6,7 @@
 */
 
 
-#if __STD_C
 static Void_t* dtvsearch(Dt_t* dt, reg Void_t* obj, reg int type)
-#else
-static Void_t* dtvsearch(dt,obj,type)
-Dt_t*          dt;
-reg Void_t*    obj;
-reg int                type;
-#endif
 {
        Dt_t            *d, *p;
        Void_t          *o, *n, *ok, *nk;
@@ -93,13 +86,7 @@ reg int              type;
        }
 }
 
-#if __STD_C
 Dt_t* dtview(reg Dt_t* dt, reg Dt_t* view)
-#else
-Dt_t* dtview(dt,view)
-reg Dt_t*      dt;
-reg Dt_t*      view;
-#endif
 {
        reg Dt_t*       d;
 

diff --git a/lib/cdt/dtwalk.c b/lib/cdt/dtwalk.c
index 345322d285d2ca49fb6e4d714f96e128de09a1db..b8aca7270c241b0bc942c5672ceb63c6af67c6d2 100644 (file)
--- a/lib/cdt/dtwalk.c
+++ b/lib/cdt/dtwalk.c
@@ -6,14 +6,7 @@
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if __STD_C
 int dtwalk(reg Dt_t* dt, int (*userf)(Dt_t*, Void_t*, Void_t*), Void_t* data)
-#else
-int dtwalk(dt,userf,data)
-reg Dt_t*      dt;
-int(*          userf)();
-Void_t*                data;
-#endif
 {
        reg Void_t      *obj, *next;
        reg Dt_t*       walk;