libDtSearch: Enable compiling with const support, remove ability to build without const support.

cde/lib/DtSearch/raima/Imakefile

@@ -38,7 +38,7 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=500
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-          -DNO_TRANS -DUNIX -DNO_CONST -D_POSIX_SOURCE 
+          -DNO_TRANS -DUNIX -D_POSIX_SOURCE 
 
 INCLUDES = -I.
 

cde/lib/DtSearch/raima/csmwrite.c

@@ -54,7 +54,7 @@ int
 d_csmwrite(set, field, data TASK_PARM DBN_PARM)
 int set;    /* Set constant */
 long field; /* Field constant */
-CONST char *data; /* Data area to contain field contents */
+const char *data; /* Data area to contain field contents */
 TASK_DECL
 DBN_DECL    /* database number */
 {

cde/lib/DtSearch/raima/csowrite.c

@@ -54,7 +54,7 @@ int
 d_csowrite(set, field, data TASK_PARM DBN_PARM)
 int set;    /* Set constant */
 long field; /* Field constant */
-CONST char *data; /* Data area to contain field contents */
+const char *data; /* Data area to contain field contents */
 TASK_DECL
 DBN_DECL    /* database number */
 {

cde/lib/DtSearch/raima/dbdpath.c

@@ -51,7 +51,7 @@
 */
 int
 d_dbdpath(path TASK_PARM)
-CONST char *path;
+const char *path;
 TASK_DECL
 {
    DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_NONE));

cde/lib/DtSearch/raima/dbfpath.c

@@ -51,7 +51,7 @@
 */
 int
 d_dbfpath(path TASK_PARM)
-CONST char *path;
+const char *path;
 TASK_DECL
 {
    DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_NONE));

cde/lib/DtSearch/raima/dblfcns.c

@@ -213,7 +213,7 @@ extern char taf_files[TAFLIMIT][FILENMLEN];
 /* Internal function prototypes */
 #ifndef SINGLE_USER
 static void pr_lock_descr(P1(struct lock_descr *) Pi(int) 
-					    Pi(CONST char *));
+					    Pi(const char *));
 static int process_lock(P1(struct lock_descr *) Pi(char));
 static int keep_locks(P1(struct lock_descr *));
 static int free_files(P1(struct lock_descr *));
@@ -278,8 +278,8 @@ TASK_DECL
 */
 int
 d_open(dbnames, opentype TASK_PARM)
-CONST char *dbnames;
+const char *dbnames;
-CONST char *opentype;
+const char *opentype;
 TASK_DECL
 {
    DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_ALL));
@@ -445,13 +445,13 @@ TASK *tsk;
 */
 int
 initdbt(dbnames )
-CONST char *dbnames;
+const char *dbnames;
 {
    int dbt_lc;			/* loop control */
    char dbfile [DtSrFILENMLEN];
    char *ptr;
 #ifndef	 ONE_DB
-   CONST char *cp;
+   const char *cp;
    int i;
 #endif
 
@@ -660,7 +660,7 @@ send_open:
 
    if ( recv_pkt->status == L_RECOVER )  {
       /* perform auto-recovery */
-      d_recover( (CONST char *)recv_pkt->logfile CURRTASK_PARM );
+      d_recover( (const char *)recv_pkt->logfile CURRTASK_PARM );
 
       /* tell lock mgr we're done */
       trend_pkt.fcn = L_RECDONE;
@@ -2127,7 +2127,7 @@ TASK_DECL
 /* Begin transaction
 */
 d_trbegin(tid TASK_PARM)
-CONST char *tid;
+const char *tid;
 TASK_DECL
 {
    DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_IO));

cde/lib/DtSearch/raima/dblog.c

@@ -50,7 +50,7 @@
 /* Set database log file name/path
 */
 d_dblog(log TASK_PARM)
-CONST char *log;
+const char *log;
 TASK_DECL
 {
    DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_NONE));

cde/lib/DtSearch/raima/dbtaf.c

@@ -53,7 +53,7 @@ static char VISTATAF[] = "vista.taf";
 /* Set database transaction activity file name/path
 */
 d_dbtaf(taf TASK_PARM)
-CONST char *taf;
+const char *taf;
 TASK_DECL
 {
    char dbtaf[FILENMLEN];

cde/lib/DtSearch/raima/dbuserid.c

@@ -53,10 +53,10 @@
 */
 int
 d_dbuserid(id TASK_PARM)
-CONST char *id;
+const char *id;
 TASK_DECL
 {
-   CONST char *chk_id;
+   const char *chk_id;
 
    DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_NONE));
 

cde/lib/DtSearch/raima/dbxtrn.h

@@ -94,7 +94,7 @@ typedef struct TASK_S {
    INT_P Excl_locks;          /* excl_locks = NULL */
    INT_P Kept_locks;          /* kept_locks = NULL */
 #endif
-   CONST char *Trans_id;  /* trans_id = NULL */
+   const char *Trans_id;  /* trans_id = NULL */
    char Dblog[FILENMLEN];     /* dblog = "" */
 #ifndef SINGLE_USER
    LOCK_DESCR_P Rec_locks;    /* rec_locks = NULL */

cde/lib/DtSearch/raima/destroy.c

@@ -56,7 +56,7 @@
 */
 int
 d_destroy(dbname TASK_PARM)
-CONST char *dbname;
+const char *dbname;
 TASK_DECL
 {
    int ft_lc;			/* loop control */

cde/lib/DtSearch/raima/dio.c

@@ -953,7 +953,7 @@ int hold;
 int
 dio_write( dba, recptr, release )
 DB_ADDR dba;
-CONST char *recptr;
+const char *recptr;
 int release;
 {
    FILE_NO file;

cde/lib/DtSearch/raima/dproto.h

@@ -162,7 +162,7 @@
 int d_setfiles(P1(int));				/* dio.c */
 int d_setpages(P1(int) Pi(int));			/* dio.c */
 int d_trbound(P0);				/* trlog.c */
-int d_trlog(P1(int) Pi(int) Pi(CONST char *) Pi(int)); 
+int d_trlog(P1(int) Pi(int) Pi(const char *) Pi(int)); 
 								/* trlog.c */
 int d_trmark(P0);				/* trlog.c */
 int d_tron(P0);					/* trlog.c */
@@ -204,13 +204,13 @@ int d_csmget(P1(int) Pi(DB_ADDR *) DBN_Dn); 	/* csmget.c */
 int d_csmread(P1(int) Pi(long) Pi(char *) DBN_Dn); 
 								/* csmread.c */
 int d_csmset(P1(int) Pi(DB_ADDR *) DBN_Dn); 	/* csmset.c */
-int d_csmwrite(P1(int) Pi(long) Pi(CONST char *) DBN_Dn); 
+int d_csmwrite(P1(int) Pi(long) Pi(const char *) DBN_Dn); 
 								/* csmwrite.c */
 int d_csoget(P1(int) Pi(DB_ADDR *) DBN_Dn); 	/* csoget.c */
 int d_csoread(P1(int) Pi(long) Pi(char *) DBN_Dn); 
 								/* csoread.c */
 int d_csoset(P1(int) Pi(DB_ADDR *) DBN_Dn); 	/* csoset.c */
-int d_csowrite(P1(int) Pi(long) Pi(CONST char *) DBN_Dn); 
+int d_csowrite(P1(int) Pi(long) Pi(const char *) DBN_Dn); 
 								/* csowrite.c */
 #ifndef NO_TIMESTAMP			   /* NO_TIMESTAMP */
 int d_csstat(P1(int) DBN_Dn);			/* csstat.c */
@@ -219,20 +219,20 @@ int d_ctsco(P1(int) Pi(ULONG *) DBN_Dn); 	/* ctsco.c */
 int d_ctscr(P1(ULONG *));			/* ctscr.c */
 #endif					   /* NO_TIMESTAMP */
 #ifndef NO_COUNTRY
-int d_ctbpath(P1(CONST char *));		/* pathfcns.c */
+int d_ctbpath(P1(const char *));		/* pathfcns.c */
 #endif					   /* NO_COUNTRY */
-int d_dbdpath(P1(CONST char *));		/* dbdpath.c */
+int d_dbdpath(P1(const char *));		/* dbdpath.c */
-int d_dbfpath(P1(CONST char *));		/* dbfpath.c */
+int d_dbfpath(P1(const char *));		/* dbfpath.c */
-int d_dblog(P1(CONST char *));		/* dblog.c */
+int d_dblog(P1(const char *));		/* dblog.c */
-int d_dbtaf(P1(CONST char *));		/* dbtaf.c */
+int d_dbtaf(P1(const char *));		/* dbtaf.c */
-int d_dbuserid(P1(CONST char *));		/* dbuserid.c */
+int d_dbuserid(P1(const char *));		/* dbuserid.c */
 int d_delete(DBN_D1);				/* delete.c */
 int d_disdel(DBN_D1);				/* disdel.c */
 int d_recnext(DBN_D1);				/* recnext.c */
 int d_recprev(DBN_D1);				/* recprev.c */
-int d_destroy(P1(CONST char *));		/* destroy.c */
+int d_destroy(P1(const char *));		/* destroy.c */
 int d_discon(P1(int) DBN_Dn);			/* discon.c */
-int d_fillnew(P1(int) Pi(CONST char *) DBN_Dn); /* fillnew.c */
+int d_fillnew(P1(int) Pi(const char *) DBN_Dn); /* fillnew.c */
 int d_findco(P1(int) DBN_Dn);			/* findco.c */
 int d_findfm(P1(int) DBN_Dn);			/* findfm.c */
 int d_findlm(P1(int) DBN_Dn);			/* findlm.c */
@@ -251,7 +251,7 @@ int d_ismember(P1(int) DBN_Dn);			/* ismember.c */
 int d_isowner(P1(int) DBN_Dn);			/* isowner.c */
 int d_keydel(P1(long) DBN_Dn);			/* keydel.c */
 int d_keyexist(P1(long) DBN_Dn);			/* keyexist.c */
-int d_keyfind(P1(long) Pi(CONST char *) DBN_Dn); 
+int d_keyfind(P1(long) Pi(const char *) DBN_Dn); 
 								/* keyfind.c */
 int d_keyfree(P1(long) DBN_Dn);			/* dblfcns.c */
 int d_keyfrst(P1(long) DBN_Dn);			/* keyfrst.c */
@@ -265,11 +265,11 @@ int d_keystore(P1(long) DBN_Dn);			/* keystore.c */
 int d_lock(P1(int) Pi(LOCK_REQUEST *) DBN_Dn); /* dblfcns.c */
 int d_makenew(P1(int) DBN_Dn);			/* makenew.c */
 int d_mapchar(P1(unsigned char) Pi(unsigned char) 
-		      Pi(CONST char *) Pi(unsigned char));  /* mapchar.c */
+		      Pi(const char *) Pi(unsigned char));  /* mapchar.c */
 int d_members(P1(int) Pi(LONG *) DBN_Dn); 	/* members.c */
 int d_off_opt(P1(int));				/* options.c */
 int d_on_opt(P1(int));				/* options.c */
-int d_open(P1(CONST char *) Pi(CONST char *)); 
+int d_open(P1(const char *) Pi(const char *)); 
 								/* dblfcns.c */
 int d_rerdcurr(P1(DB_ADDR **));		/* rwcurr.c */
 int d_rdcurr(P1(DB_ADDR **) Pi(int *));	/* rwcurr.c */
@@ -279,15 +279,15 @@ int d_recfrst(P1(int) DBN_Dn);			/* recfrst.c */
 int d_reclast(P1(int) DBN_Dn);			/* reclast.c */
 int d_reclock(P1(int) Pi(char *) DBN_Dn); 	/* dblfcns.c */
 int d_reclstat(P1(int) Pi(char *) DBN_Dn); 	/* dblfcns.c */
-int d_recover(P1(CONST char *));		/* recover.c */
+int d_recover(P1(const char *));		/* recover.c */
 int d_recread(P1(char *) DBN_Dn);		/* recread.c */
 int d_recset(P1(int) DBN_Dn);   			/* recset.c */
 #ifndef NO_TIMESTAMP			   /* NO_TIMESTAMP */
 int d_recstat(P1(DB_ADDR) Pi(ULONG));		/* recstat.c */
 #endif					   /* NO_TIMESTAMP */
-int d_recwrite(P1(CONST char *) DBN_Dn); 	/* recwrite.c */
+int d_recwrite(P1(const char *) DBN_Dn); 	/* recwrite.c */
-int d_renfile(P1(CONST char *) Pi(FILE_NO) 
+int d_renfile(P1(const char *) Pi(FILE_NO) 
-				Pi(CONST char *)); 		/* renfile.c */
+				Pi(const char *)); 		/* renfile.c */
 int d_retries(P1(int));				/* dblfcns.c */
 int d_rlbclr(P0);				/* dblfcns.c */
 int d_rlbset(P0);				/* dblfcns.c */
@@ -297,7 +297,7 @@ int d_set_dberr(P1(FARPROC));			/* dberr.c */
 int d_setdb(P1(int));				/* setdb.c */
 #endif					   /* ONE_DB */
 int d_setfree(P1(int) DBN_Dn);			/* dblfcns.c */
-int d_setkey(P1(long) Pi(CONST char *) DBN_Dn); /* makenew.c */
+int d_setkey(P1(long) Pi(const char *) DBN_Dn); /* makenew.c */
 int d_setlock(P1(int) Pi(char *) DBN_Dn); 	/* dblfcns.c */
 int d_setlstat(P1(int) Pi(char *) DBN_Dn); 	/* dblfcns.c */
 int d_setmm(P1(int) Pi(int) DBN_Dn); 		/* setmm.c */
@@ -316,7 +316,7 @@ int d_stscs(P1(int) Pi(ULONG) DBN_Dn); 		/* stscs.c */
 #endif					   /* NO_TIMESTAMP */
 int d_timeout(P1(int));				/* dblfcns.c */
 int d_trabort(P0);				/* dblfcns.c */
-int d_trbegin(P1(CONST char *));		/* dblfcns.c */
+int d_trbegin(P1(const char *));		/* dblfcns.c */
 int d_trend(P0);					/* dblfcns.c */
 #ifndef NO_TIMESTAMP			   /* NO_TIMESTAMP */
 int d_utscm(P1(int) Pi(ULONG *) DBN_Dn); 	/* utscm.c */

cde/lib/DtSearch/raima/fillnew.c

@@ -57,7 +57,7 @@
 int
 d_fillnew( nrec, recval TASK_PARM DBN_PARM )
 int nrec;       /* record number */
-CONST char *recval; /* record value */
+const char *recval; /* record value */
 TASK_DECL
 DBN_DECL      /* database number */
 {

cde/lib/DtSearch/raima/keydel.c

@@ -62,7 +62,7 @@ DBN_DECL    /* database number */
    int fld;        /* field number */
    int rec, rn;    /* record type of current record */
    char *rptr;     /* pointer to current record */
-   CONST char *fptr;     /* pointer to field contents */
+   const char *fptr;     /* pointer to field contents */
    char ckey[256]; /* compound key data */
    int stat;
    RECORD_ENTRY *rec_ptr;

cde/lib/DtSearch/raima/keyfcns.c

@@ -114,12 +114,12 @@ typedef struct {
 #define KEYREPOS 3
 
 /* Internal function prototypes */
-static int node_search(P1(CONST char *) Pi(DB_ADDR *) 
+static int node_search(P1(const char *) Pi(DB_ADDR *) 
 				      Pi(NODE *) Pi(int *) Pi(int *) 
 				      Pi(F_ADDR *));
-static int keycmp(P1(CONST char *) Pi(KEY_SLOT *) 
+static int keycmp(P1(const char *) Pi(KEY_SLOT *) 
 				    Pi(DB_ADDR *));
-static int expand(P1(CONST char *) Pi(DB_ADDR) Pi(F_ADDR));
+static int expand(P1(const char *) Pi(DB_ADDR) Pi(F_ADDR));
 static int split_root(P1(NODE *));
 static int split_node(P1(F_ADDR) Pi(NODE *));
 static int delete(P0);
@@ -290,7 +290,7 @@ FILE_NO fno;
 */
 int
 key_locpos(key_val, dba)
-CONST char *key_val; /* key search value */
+const char *key_val; /* key search value */
 DB_ADDR *dba;        /* database address of located key */
 {
    NODE *node;   /* pointer to current node */
@@ -382,7 +382,7 @@ DB_ADDR *dba;        /* database address of located key */
 */
 static int node_search(key_val, dba, node, slotno, slot_offset, 
 					 child)
-CONST char *key_val; /* key being searched */
+const char *key_val; /* key being searched */
 DB_ADDR *dba;    /* database address included in comparison if not null */
 NODE    *node;   /* node being searched */
 int     *slotno; /* slot number of key position in node */
@@ -436,7 +436,7 @@ have_slot:
 /* Compare key value
 */
 static int keycmp(key_val, slot, dba)
-CONST char *key_val;  /* key value */
+const char *key_val;  /* key value */
 KEY_SLOT *slot;    /* pointer to key slot to be compared */
 DB_ADDR *dba;     /* database address included in comparison if not null */
 {
@@ -669,7 +669,7 @@ DB_ADDR *dba; /* to get dba of first or last key */
 int
 key_insert(fld, key_val, dba )
 int fld;      /* key field number */
-CONST char *key_val; /* key value */
+const char *key_val; /* key value */
 DB_ADDR dba;  /* record's database address */
 {
    int stat;
@@ -703,7 +703,7 @@ DB_ADDR dba;  /* record's database address */
 /* Expand node for new key
 */
 static int expand(key_val, dba, brother )
-CONST char *key_val;    /* key value */
+const char *key_val;    /* key value */
 DB_ADDR dba;     /* record's database address */
 F_ADDR brother;  /* page number of brother node */
 {
@@ -860,7 +860,7 @@ NODE *node;
 int
 key_delete(fld, key_val, dba )
 int fld;
-char CONST *key_val;
+char const *key_val;
 DB_ADDR dba;
 {
    int stat;

cde/lib/DtSearch/raima/keyfind.c

@@ -52,14 +52,14 @@
 
 /* Internal function prototypes */
 static void chk_desc_key(P1(int) Pi(FIELD_ENTRY *) 
-					Pi(CONST char *) Pi(char *));
+					Pi(const char *) Pi(char *));
 
 /* Find record thru key field
 */
 int
 d_keyfind(field, fldval TASK_PARM DBN_PARM)
 long  field;  /* field constant */
-CONST char *fldval; /* value of the data field */
+const char *fldval; /* value of the data field */
 TASK_DECL
 DBN_DECL      /* database number */
 {
@@ -105,7 +105,7 @@ DBN_DECL      /* database number */
 static void chk_desc_key(fld, fld_ptr, fldval, ckey)
 int fld;
 FIELD_ENTRY *fld_ptr;
-CONST char *fldval;
+const char *fldval;
 char *ckey;
 {
    int kt_lc;			/* loop control */

cde/lib/DtSearch/raima/libfcns.c

@@ -65,8 +65,8 @@
 /* Internal function prototypes */
 static int rec_okay(P1(int) Pi(int *) 
 				   Pi(RECORD_ENTRY * *));
-static int ctblcmp(P1(CONST unsigned char FAR*)
+static int ctblcmp(P1(const unsigned char FAR*)
-                                  Pi(CONST unsigned char FAR*) Pi(int));
+                                  Pi(const unsigned char FAR*) Pi(int));
 
 #ifndef	 ONE_DB
 /* Check for valid db number and set curr_db, curr_db_table and curr_rn_table
@@ -170,8 +170,8 @@ RECORD_ENTRY * *rec_ptr;
 */
 int fldcmp(fld_ptr, f1, f2)
 FIELD_ENTRY *fld_ptr;
-CONST char *f1;   /* pointer to field 1 */
+const char *f1;   /* pointer to field 1 */
-CONST char *f2;   /* pointer to field 2 */
+const char *f2;   /* pointer to field 2 */
 /*
    returns < 0 if f1 < f2,
 	   = 0 if f1 == f2,
@@ -328,7 +328,7 @@ CONST char *f2;   /* pointer to field 2 */
 /* compare the INT variables
 */
 int INTcmp( i1, i2 )
-CONST char *i1, *i2;
+const char *i1, *i2;
 {
    INT I1, I2;
 
@@ -341,7 +341,7 @@ CONST char *i1, *i2;
 /* compare two DB_ADDR variables 
 */
 int ADDRcmp( d1, d2 )
-CONST DB_ADDR *d1, *d2;
+const DB_ADDR *d1, *d2;
 {
    DB_ADDR a1, a2;
    FILE_NO f1, f2;
@@ -371,7 +371,7 @@ CONST DB_ADDR *d1, *d2;
 */
 int
 null_dba( db_addr )
-CONST char *db_addr;
+const char *db_addr;
 {
    DB_ADDR dba;
 
@@ -409,8 +409,8 @@ DB_ADDR dba;
 /* Compare two strings with sorting according to char-table
 */
 static int ctblcmp(s, t, n)
-CONST unsigned char *s;  /* String 1 */
+const unsigned char *s;  /* String 1 */
-CONST unsigned char *t;  /* String 2 */
+const unsigned char *t;  /* String 2 */
 int    n;   /* Max. String length */
 {
    int x;

cde/lib/DtSearch/raima/makenew.c

@@ -56,7 +56,7 @@
 int
 d_setkey( field, fldvalue TASK_PARM DBN_PARM )
 long field;
-CONST char *fldvalue;
+const char *fldvalue;
 TASK_DECL
 DBN_DECL
 {

cde/lib/DtSearch/raima/mapchar.c

@@ -79,7 +79,7 @@ static int nextc(P1(int));
 int d_mapchar(inchar,outchar,sort_str,subsort TASK_PARM)
 unsigned char	inchar;     /* value of character to be mapped */
 unsigned char	outchar;    /* output character as    ... */
-CONST char *sort_str;  /* sort string (max. len = 2) */
+const char *sort_str;  /* sort string (max. len = 2) */
 unsigned char	subsort;    /* subsort value, to distinguish between two */
 			    /* equal values (e.g. 'a' and 'A', if necessary) */
 TASK_DECL

cde/lib/DtSearch/raima/opens.c

@@ -61,7 +61,7 @@
 /* Open a binary file for shared access
 */
 int open_b(filenm, flags)
-CONST char *filenm;
+const char *filenm;
 int flags;  
 {
    int desc;

cde/lib/DtSearch/raima/pathfcns.c

@@ -227,7 +227,7 @@ int num;		/* Element to extract (0 = first) */
       if ((dbxpath = strchr(dbxpath+1,';')) == NULL) return (NULL);
    dbxpath++;
    if ((save = strchr(dbxpath+1,';')) != NULL) *save = '\0';
-   i = (dbxpath - (char *)element) + strlen((CONST char *)dbxpath);
+   i = (dbxpath - (char *)element) + strlen((const char *)dbxpath);
    if (element[i-1] != DIRCHAR && element[i-1] != ':') {
       element[i++] = DIRCHAR;
       element[i] = '\0';
@@ -299,7 +299,7 @@ char *path_str;		/* Path to remove filename from */
 /* Set Country Table path
 */
 int d_ctbpath(ctb TASK_PARM)
-CONST char *ctb;
+const char *ctb;
 TASK_DECL
 {
    int i;

cde/lib/DtSearch/raima/proto.h

@@ -146,7 +146,7 @@ void dbautorec(P0);
 
 /* From dblfcns.c: */
 int taskinit(P1(TASK *));
-int initdbt(P1(CONST char *));
+int initdbt(P1(const char *));
 int alloc_table(P1(CHAR_P *) Pi(unsigned) Pi(unsigned));
 #define ALLOC_TABLE(t, n, o, v)	alloc_table((CHAR_P *)(t), n, o)
 #ifndef SINGLE_USER
@@ -169,7 +169,7 @@ void dio_setdef(P1(FILE_NO));
 int dio_get(P1(F_ADDR) Pi(char * *) Pi(int));
 int dio_touch(P1(F_ADDR));
 int dio_read(P1(DB_ADDR) Pi(char * *) Pi(int));
-int dio_write(P1(DB_ADDR) Pi(CONST char *) Pi(int));
+int dio_write(P1(DB_ADDR) Pi(const char *) Pi(int));
 int dio_release(P1(DB_ADDR));
 int dio_rrlb(P1(DB_ADDR) Pi(INT *));
 int dio_wrlb(P1(DB_ADDR) Pi(INT));
@@ -203,11 +203,11 @@ int key_open(P0);
 void key_close(P0);
 int key_init(P1(int));
 int key_reset(P1(FILE_NO));
-int key_locpos(P1(CONST char *) Pi(DB_ADDR *));
+int key_locpos(P1(const char *) Pi(DB_ADDR *));
 int key_scan(P1(int) Pi(DB_ADDR *));
 int key_boundary(P1(int) Pi(DB_ADDR *));
-int key_insert(P1(int) Pi(CONST char *) Pi(DB_ADDR));
+int key_insert(P1(int) Pi(const char *) Pi(DB_ADDR));
-int key_delete(P1(int) Pi(CONST char *) Pi(DB_ADDR));
+int key_delete(P1(int) Pi(const char *) Pi(DB_ADDR));
 /* Due to a problem with MSC 5.1, we couldn't declare the 2nd parm
    of key_bldcom as const (see keyfcns.c) */
 int key_bldcom(P1(int) Pi(char *) Pi(char *) Pi(int));
@@ -225,11 +225,11 @@ int nfld_check(P1(long) Pi(int *) Pi(int *)
 			      Pi(RECORD_ENTRY * *) 
 			      Pi(FIELD_ENTRY * *));
 int nrec_check(P1(int) Pi(int *) Pi(RECORD_ENTRY * *));
-int fldcmp(P1(FIELD_ENTRY *) Pi(CONST char *) 
+int fldcmp(P1(FIELD_ENTRY *) Pi(const char *) 
-			     Pi(CONST char *));
+			     Pi(const char *));
-int INTcmp(P1(CONST char *) Pi(CONST char *));
+int INTcmp(P1(const char *) Pi(const char *));
-int ADDRcmp(P1(CONST DB_ADDR *) Pi(CONST DB_ADDR *));
+int ADDRcmp(P1(const DB_ADDR *) Pi(const DB_ADDR *));
-int null_dba(P1(CONST char *));
+int null_dba(P1(const char *));
 int check_dba(P1(DB_ADDR));
 
 /* From makenew.c: */
@@ -248,7 +248,7 @@ int nw_send(P1(int) Pi(MESSAGE *) Pi(int));
 int nw_rcvmsg(P1(int) Pi(MESSAGE *) Pi(int) Pi(int *));
 
 /* From opens.c: */
-int open_b(P1(CONST char *) Pi(int));
+int open_b(P1(const char *) Pi(int));
 
 /* From ovfcns.c: */
 int o_setup(P0);
@@ -264,13 +264,13 @@ void o_free(P0);
 
 /* From recfcns.c: */
 int r_chkfld(P1(INT) Pi(FIELD_ENTRY *) Pi(char *)
-	     Pi(CONST char *));
+	     Pi(const char *));
 int r_delrec(P1(INT) Pi(DB_ADDR));
 int r_gfld(P1(FIELD_ENTRY *) Pi(char *) Pi(char *));
 int r_gmem(P1(int) Pi(char *) Pi(char *));
 int r_gset(P1(int) Pi(char *) Pi(char *));
 int r_pfld(P1(INT) Pi(FIELD_ENTRY *) Pi(char *) 
-			     Pi(CONST char *) Pi(DB_ADDR *));
+			     Pi(const char *) Pi(DB_ADDR *));
 int r_pmem(P1(int) Pi(char *) Pi(char *));
 int r_pset(P1(int) Pi(char *) Pi(char *));
 int r_smem(P1(DB_ADDR *) Pi(INT));
@@ -303,8 +303,8 @@ int taf_open(P0);
 int taf_close(P0);
 int taf_access(P0);
 int taf_release(P0);
-int taf_add(P1(CONST char *));
+int taf_add(P1(const char *));
-int taf_del(P1(CONST char *) );
+int taf_del(P1(const char *) );
 
 /* From task.c */
 #ifdef MULTI_TASK
@@ -324,14 +324,14 @@ void ctbl_free(P0);
   int  CDECL memcmp(P1(char *) Pi(char *) Pi(int));
   void CDECL memset(P1(char *) Pi(char) Pi(int));
 
-  int CDECL strcmp(P1(CONST char *) Pi(CONST char *));
+  int CDECL strcmp(P1(const char *) Pi(const char *));
-  char * CDECL strcpy(P1(char *) Pi(CONST char *));
+  char * CDECL strcpy(P1(char *) Pi(const char *));
-  char * CDECL strcat(P1(char *) Pi(CONST char *));
+  char * CDECL strcat(P1(char *) Pi(const char *));
-  int CDECL strlen(P1(CONST char *));
+  int CDECL strlen(P1(const char *));
-  int CDECL strncmp(P1(CONST char *) Pi(CONST char *) Pi(int));
+  int CDECL strncmp(P1(const char *) Pi(const char *) Pi(int));
-  char * CDECL strncpy(P1(char *) Pi(CONST char *) Pi(int));
+  char * CDECL strncpy(P1(char *) Pi(const char *) Pi(int));
-  char * CDECL strchr(P1(CONST char *) Pi(int));
+  char * CDECL strchr(P1(const char *) Pi(int));
-  char * CDECL strrchr(P1(CONST char *) Pi(int));
+  char * CDECL strrchr(P1(const char *) Pi(int));
 #endif
 
 void CDECL free(P1(void *));  /* AIXV3 - DPG 07/05/90 */
@@ -341,7 +341,7 @@ int CDECL read(P1(int) Pi(char *) Pi(unsigned int));
 long CDECL lseek(P1(int) Pi(long) Pi(int));
 int CDECL close(P1(int));
 void CDECL exit(P1(int));
-char * CDECL getenv(P1(CONST char *));
+char * CDECL getenv(P1(const char *));
 int CDECL locking(P1(int) Pi(int) Pi(long));
-int CDECL unlink(P1(CONST char *));
+int CDECL unlink(P1(const char *));
 /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC -f/usr/users/master/config/nonwin proto.h */

cde/lib/DtSearch/raima/recfcns.c

@@ -75,7 +75,7 @@ r_chkfld(field, fld_ptr, rec, data )
 INT field;  /* field_table entry number */
 FIELD_ENTRY *fld_ptr; /* corresponds to field */
 char *rec;  /* pointer to record slot */
-CONST char *data; /* pointer to data area containing field contents */
+const char *data; /* pointer to data area containing field contents */
 {
    DB_ADDR dba;
    long fld;
@@ -318,14 +318,14 @@ r_pfld(field, fld_ptr, rec, data, db_addr )
 INT field;  /* field_table entry number */
 FIELD_ENTRY *fld_ptr; /* corresponds to field */
 char *rec;  /* pointer to existing record */
-CONST char *data; /* pointer to data area containing new field contents */
+const char *data; /* pointer to data area containing new field contents */
 DB_ADDR *db_addr;
 {
    DB_ADDR mdba, odba, dba;
    int set, sn;
    char memp[MEMPSIZE];
    char *fptr;
-   CONST char *tfptr;
+   const char *tfptr;
    int s, i, strfld;
    FIELD_ENTRY *sfld_ptr;
    SORT_ENTRY *srt_ptr;

cde/lib/DtSearch/raima/recwrite.c

@@ -53,7 +53,7 @@
 */
 int
 d_recwrite(rec TASK_PARM DBN_PARM)
-CONST char *rec; /* ptr to record area */
+const char *rec; /* ptr to record area */
 TASK_DECL
 DBN_DECL
 {

cde/lib/DtSearch/raima/renfile.c

@@ -48,9 +48,9 @@
 */
 int
 d_renfile(dbn, fno, fnm TASK_PARM)
-CONST char *dbn;  /* database containing file to be renamed */
+const char *dbn;  /* database containing file to be renamed */
 FILE_NO fno;  /* file id number for file to be renamed */
-CONST char *fnm;  /* new file name */
+const char *fnm;  /* new file name */
 TASK_DECL
 {
    REN_ENTRY_P r;

cde/lib/DtSearch/raima/task.h

@@ -284,7 +284,7 @@ int EXTERNAL_DBN   dt_csmread(P1(int) Pi(long) Pi(char *) TASK_Di DBN_Dn);
 								/* csmread.c */
 int EXTERNAL_DBN   dt_csmset(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
 								/* csmset.c */
-int EXTERNAL_DBN   dt_csmwrite(P1(int) Pi(long) Pi(CONST char *) TASK_Di 
+int EXTERNAL_DBN   dt_csmwrite(P1(int) Pi(long) Pi(const char *) TASK_Di 
 				  DBN_Dn); 			/* csmwrite.c */
 int EXTERNAL_DBN   dt_csoget(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
 								/* csoget.c */
@@ -292,7 +292,7 @@ int EXTERNAL_DBN   dt_csoread(P1(int) Pi(long) Pi(char *) TASK_Di DBN_Dn);
 								/* csoread.c */
 int EXTERNAL_DBN   dt_csoset(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
 								/* csoset.c */
-int EXTERNAL_DBN   dt_csowrite(P1(int) Pi(long) Pi(CONST char *) TASK_Di 
+int EXTERNAL_DBN   dt_csowrite(P1(int) Pi(long) Pi(const char *) TASK_Di 
 				  DBN_Dn); 			/* csowrite.c */
 #ifndef NO_TIMESTAMP
 int EXTERNAL_DBN   dt_csstat(P1(int) TASK_Di DBN_Dn);		/* csstat.c */
@@ -303,19 +303,19 @@ int EXTERNAL_DBN   dt_ctsco(P1(int) Pi(ULONG *) TASK_Di DBN_Dn);
 int EXTERNAL_FIXED dt_ctscr(P1(ULONG *) TASK_Di );		/* ctscr.c */
 #endif
 #ifndef NO_COUNTRY
-int EXTERNAL_FIXED dt_ctbpath(P1(CONST char *) TASK_Di);	/* pathfcns.c */
+int EXTERNAL_FIXED dt_ctbpath(P1(const char *) TASK_Di);	/* pathfcns.c */
 #endif
-int EXTERNAL_FIXED dt_dbdpath(P1(CONST char *) TASK_Di );	/* dbdpath.c */
+int EXTERNAL_FIXED dt_dbdpath(P1(const char *) TASK_Di );	/* dbdpath.c */
-int EXTERNAL_FIXED dt_dbfpath(P1(CONST char *) TASK_Di );	/* dbfpath.c */
+int EXTERNAL_FIXED dt_dbfpath(P1(const char *) TASK_Di );	/* dbfpath.c */
-int EXTERNAL_FIXED dt_dblog(P1(CONST char *) TASK_Di );	/* dblog.c */
+int EXTERNAL_FIXED dt_dblog(P1(const char *) TASK_Di );	/* dblog.c */
-int EXTERNAL_FIXED dt_dbuserid(P1(CONST char *) TASK_Di );	/* dbuserid.c */
+int EXTERNAL_FIXED dt_dbuserid(P1(const char *) TASK_Di );	/* dbuserid.c */
 int EXTERNAL_DBN   dt_delete(TASK_D1 DBN_Dn);			/* delete.c */
 int EXTERNAL_DBN   dt_disdel(TASK_D1 DBN_Dn);			/* disdel.c */
 int EXTERNAL_DBN   dt_recnext(TASK_D1 DBN_Dn);			/* recnext.c */
 int EXTERNAL_DBN   dt_recprev(TASK_D1 DBN_Dn);			/* recprev.c */
-int EXTERNAL_FIXED dt_destroy(P1(CONST char *) TASK_Di );	/* destroy.c */
+int EXTERNAL_FIXED dt_destroy(P1(const char *) TASK_Di );	/* destroy.c */
 int EXTERNAL_DBN   dt_discon(P1(int) TASK_Di DBN_Dn);		/* discon.c */
-int EXTERNAL_DBN   dt_fillnew(P1(int) Pi(CONST char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_fillnew(P1(int) Pi(const char *) TASK_Di DBN_Dn); 
 								/* fillnew.c */
 int EXTERNAL_DBN   dt_findco(P1(int) TASK_Di DBN_Dn);		/* findco.c */
 int EXTERNAL_DBN   dt_findfm(P1(int) TASK_Di DBN_Dn);		/* findfm.c */
@@ -338,7 +338,7 @@ int EXTERNAL_DBN   dt_ismember(P1(int) TASK_Di DBN_Dn);		/* ismember.c */
 int EXTERNAL_DBN   dt_isowner(P1(int) TASK_Di DBN_Dn);		/* isowner.c */
 int EXTERNAL_DBN   dt_keydel(P1(long) TASK_Di DBN_Dn);		/* keydel.c */
 int EXTERNAL_DBN   dt_keyexist(P1(long) TASK_Di DBN_Dn);	/* keyexist.c */
-int EXTERNAL_DBN   dt_keyfind(P1(long) Pi(CONST char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_keyfind(P1(long) Pi(const char *) TASK_Di DBN_Dn); 
 								/* keyfind.c */
 int EXTERNAL_DBN   dt_keyfree(P1(long) TASK_Di DBN_Dn);		/* dblfcns.c */
 int EXTERNAL_DBN   dt_keyfrst(P1(long) TASK_Di DBN_Dn);		/* keyfrst.c */
@@ -355,13 +355,13 @@ int EXTERNAL_DBN   dt_lock(P1(int) Pi(LOCK_REQUEST *) TASK_Di DBN_Dn);
 								/* dblfcns.c */
 int EXTERNAL_DBN   dt_makenew(P1(int) TASK_Di DBN_Dn);		/* makenew.c */
 int EXTERNAL_FIXED dt_mapchar(P1(unsigned char) Pi(unsigned char) 
-		      Pi(CONST char *) Pi(unsigned char) TASK_Di);
+		      Pi(const char *) Pi(unsigned char) TASK_Di);
 								/* mapchar.c */
 int EXTERNAL_DBN   dt_members(P1(int) Pi(LONG *) TASK_Di DBN_Dn); 
 								/* members.c */
 int EXTERNAL_FIXED dt_off_opt(P1(int) TASK_Di );		/* options.c */
 int EXTERNAL_FIXED dt_on_opt(P1(int) TASK_Di );			/* options.c */
-int EXTERNAL_FIXED dt_open(P1(CONST char *) Pi(CONST char *) TASK_Di);
+int EXTERNAL_FIXED dt_open(P1(const char *) Pi(const char *) TASK_Di);
 								/* dblfcns.c */
 int EXTERNAL_FIXED dt_rdcurr(P1(DB_ADDR **) Pi(int *) TASK_Di); 
 								/* rwcurr.c */
@@ -374,16 +374,16 @@ int EXTERNAL_DBN   dt_reclock(P1(int) Pi(char *) TASK_Di DBN_Dn);
 								/* dblfcns.c */
 int EXTERNAL_DBN   dt_reclstat(P1(int) Pi(char *) TASK_Di DBN_Dn); 
 								/* dblfcns.c */
-int EXTERNAL_FIXED dt_recover(P1(CONST char *) TASK_Di );	/* recover.c */
+int EXTERNAL_FIXED dt_recover(P1(const char *) TASK_Di );	/* recover.c */
 int EXTERNAL_DBN   dt_recread(P1(char *) TASK_Di DBN_Dn);	/* recread.c */
 int EXTERNAL_DBN   dt_recset(P1(int) TASK_Di DBN_Dn);   	/* recset.c */
 #ifndef NO_TIMESTAMP
 int EXTERNAL_FIXED dt_recstat(P1(DB_ADDR) Pi(ULONG) TASK_Di );	/* recstat.c */
 #endif
-int EXTERNAL_DBN   dt_recwrite(P1(CONST char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_recwrite(P1(const char *) TASK_Di DBN_Dn); 
 								/* recwrite.c */
-int EXTERNAL_FIXED dt_renfile(P1(CONST char *) Pi(FILE_NO) 
+int EXTERNAL_FIXED dt_renfile(P1(const char *) Pi(FILE_NO) 
-				 Pi(CONST char *) TASK_Di); /* renfile.c */
+				 Pi(const char *) TASK_Di); /* renfile.c */
 int EXTERNAL_FIXED dt_retries(P1(int) TASK_Di );		/* dblfcns.c */
 int EXTERNAL_FIXED dt_rlbclr(TASK_D1);				/* dblfcns.c */
 int EXTERNAL_FIXED dt_rlbset(TASK_D1);				/* dblfcns.c */
@@ -393,7 +393,7 @@ int EXTERNAL_FIXED dt_set_dberr(P1(FARPROC) TASK_Di);		/* dberr.c */
 int EXTERNAL_FIXED dt_setdb(P1(int) TASK_Di);			/* setdb.c */
 #endif
 int EXTERNAL_DBN   dt_setfree(P1(int) TASK_Di DBN_Dn);		/* dblfcns.c */
-int EXTERNAL_DBN   dt_setkey(P1(long) Pi(CONST char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_setkey(P1(long) Pi(const char *) TASK_Di DBN_Dn); 
 								/* makenew.c */
 int EXTERNAL_DBN   dt_setlock(P1(int) Pi(char *) TASK_Di DBN_Dn); 
 								/* dblfcns.c */
@@ -415,7 +415,7 @@ int EXTERNAL_DBN   dt_stscs(P1(int) Pi(ULONG) TASK_Di DBN_Dn); 	/* stscs.c */
 #endif
 int EXTERNAL_FIXED dt_timeout(P1(int) TASK_Di );		/* dblfcns.c */
 int EXTERNAL_FIXED dt_trabort(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_FIXED dt_trbegin(P1(CONST char *) TASK_Di);	/* dblfcns.c */
+int EXTERNAL_FIXED dt_trbegin(P1(const char *) TASK_Di);	/* dblfcns.c */
 int EXTERNAL_FIXED dt_trend(TASK_D1);				/* dblfcns.c */
 #ifndef NO_TIMESTAMP
 int EXTERNAL_DBN   dt_utscm(P1(int) Pi(ULONG *) TASK_Di DBN_Dn); 

cde/lib/DtSearch/raima/vista.h

@@ -260,13 +260,6 @@ extern int rlb_status;
  */
 extern int db_oflag;
 
-/* Use the 'const' keyword unless told otherwise */
-#ifndef NO_CONST
-#define CONST const
-#else
-#define CONST /**/
-#endif
-
 #ifndef GENERAL			/* GENERAL lockmgr */
 #ifdef MSC			/* MSC */
 #ifndef NO_EXT_KEYWORDS		   /* NO_EXT_KEYWORDS */