Low-hanging fruit: Fix most warnings in lib/DtSearch.

Most of these are related to missing includes and prototypes as well as
parens/braces.  A few are also potential 64bit issues.

diff --git a/cde/lib/DtSearch/ausexit.c b/cde/lib/DtSearch/ausexit.c
index c3e3850f9ddec42319074b117bfd8794c4c3c200..00295965adc4401dd0602fbb999dc0c028199b38 100644 (file)
--- a/cde/lib/DtSearch/ausexit.c
+++ b/cde/lib/DtSearch/ausexit.c
@@ -94,6 +94,7 @@
  * Revision 1.4  1995/08/31  21:54:23  miker
  * Rename austext_exit() to DtSearchExit().
  */
+#include <stdlib.h>
 #include "Search.h"
 
 void   (*austext_exit_first) (int) =   NULL;

diff --git a/cde/lib/DtSearch/boolpars.c b/cde/lib/DtSearch/boolpars.c
index 49d2caeb6846aa38dcd68abfd561fe8a896a4bc3..d2c7f58363c0e41153eff5e8d439f133249b8e7e 100644 (file)
--- a/cde/lib/DtSearch/boolpars.c
+++ b/cde/lib/DtSearch/boolpars.c
@@ -83,6 +83,7 @@
  * Initial revision
  */
 #include "SearchE.h"
+#include <stdlib.h>
 #include <string.h>
 #include "boolpars.h"
 #include "boolyac.h"
@@ -223,7 +224,7 @@ static TRUTHTAB     *creatett (int stemno, int pmsz, unsigned char *permutes)
 /* Destructor of passed truth table.
  * Unlinks it from ttlist and frees it.
  */
-static void    *freett (TRUTHTAB *argtt)
+static void    freett (TRUTHTAB *argtt)
 {
     TRUTHTAB   *tt;
     TRUTHTAB   **lastlink = &ttlist;
@@ -809,7 +810,7 @@ GET_ANOTHER_TOKEN:
            }
 
            /* Load stem into stems arrays and return it's truth table. */
-           if (yylval.truthtab = get_stem_truthtab (stembufp, yytext)) {
+           if ((yylval.truthtab = get_stem_truthtab (stembufp, yytext))) {
                retn_token =            WORD_TOKEN;
                last_token_was_boolop = FALSE;
            }

diff --git a/cde/lib/DtSearch/boolsrch.c b/cde/lib/DtSearch/boolsrch.c
index 10e2423c2e56e682a2c85289ab5945522679ad46..c642ba835ec5b27b5e6c84e923dce01540bb199b 100644 (file)
--- a/cde/lib/DtSearch/boolsrch.c
+++ b/cde/lib/DtSearch/boolsrch.c
@@ -169,6 +169,8 @@ static long         tot_addr_count; /* may be > reccount bcs deletes */
 static int             vistano;
 static float           *wtvec =                NULL;
 
+extern void     find_keyword (char *cur_word, int vista_num);
+extern void     read_wordstr (struct or_hwordrec * glob_word, int vista_num);
 
 /************************************************/
 /*                                             */

diff --git a/cde/lib/DtSearch/dbchange.c b/cde/lib/DtSearch/dbchange.c
index d5441de4606042257f354a9681b12f5f82595394..c8594bdfc3f62718a24ffaad91c0be72a080ddf0 100644 (file)
--- a/cde/lib/DtSearch/dbchange.c
+++ b/cde/lib/DtSearch/dbchange.c
@@ -60,6 +60,8 @@
 
 #define PROGNAME       "DBCHANGE"
 
+void            oe_uninitialize (void);
+
 /************************************************/
 /*                                             */
 /*               file_has_changed              */

diff --git a/cde/lib/DtSearch/dtoe.c b/cde/lib/DtSearch/dtoe.c
index 498d725311b3b32985fb43fba9eafd77e291061a..f251fad0275e3b8892b3b59883d17d549d53a86e 100644 (file)
--- a/cde/lib/DtSearch/dtoe.c
+++ b/cde/lib/DtSearch/dtoe.c
@@ -91,6 +91,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 
 #define PROGNAME       "DTOE"
 #define MAX_LASTQRY    64
@@ -104,6 +105,9 @@ typedef struct {
     char           *str;
 }               NUMSTR;
 
+int  boolean_parse (void);
+void boolean_search (void);
+void ve_delete (void);
 
 /*------------------ OPERA ENGINE GLOBALS --------------------
  * Default values set by init_globals() in oeinit.c
@@ -120,7 +124,7 @@ char           *global_memory_ptr = NULL;   /* shared mem, dynam
 int             shm_id = 0;    /* shared mem, dynam defrag */
 
 int             OE_bmhtab_strlen[DtSrMAX_STEMCOUNT] = { 0 };
-size_t          OE_bmhtables[DtSrMAX_STEMCOUNT][MAX_BMHTAB] = { 0 };
+size_t          OE_bmhtables[DtSrMAX_STEMCOUNT][MAX_BMHTAB] = { { 0 } };
 int             OE_dbn = 0;    /* dynamic */
 int             OE_enable_markdel = 0;
 int             OE_enable_usernotes = 0;

diff --git a/cde/lib/DtSearch/dtoeinit.c b/cde/lib/DtSearch/dtoeinit.c
index 25921e15f1c0629306bb8f7d37c9aa006482cb2c..477ef38631ff166442a08cc8bac05b13cfe2730c 100644 (file)
--- a/cde/lib/DtSearch/dtoeinit.c
+++ b/cde/lib/DtSearch/dtoeinit.c
@@ -66,6 +66,7 @@
 #include "SearchE.h"
 #include <string.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H

diff --git a/cde/lib/DtSearch/dtsrapi.c b/cde/lib/DtSearch/dtsrapi.c
index 4fe506b666b66dfb0f4360aa20e33236c1cbe2e9..b62b871660756d78b39d8f849527b33fb24f6468 100644 (file)
--- a/cde/lib/DtSearch/dtsrapi.c
+++ b/cde/lib/DtSearch/dtsrapi.c
@@ -110,6 +110,7 @@
 #include <signal.h>
 #include <locale.h>
 #include <string.h>
+#include <stdlib.h>
 #include <fcntl.h>
 
 #define PROGNAME       "DTSRAPI"
@@ -120,7 +121,7 @@
 /*------------------- PRIVATE GLOBALS ---------------------*/
 /* Usrblk should not be visible to user interface code,
  * but must be visible to real engine... */
-USRBLK          usrblk = { 0 };
+USRBLK          usrblk = { { 0 } };
 static int      save_search_type = '$';
 static char    *sprintbuf = NULL;
 
@@ -321,7 +322,7 @@ int             DtSearchInit (
     sprintbuf = austext_malloc (SPRINTBUFSZ, PROGNAME "135", NULL);
 
     /* Open msgs and help text catalogs. */
-    if (switches & DtSrInNOLOCALE == 0) {
+    if (switches & (DtSrInNOLOCALE == 0)) {
        setlocale (LC_ALL, "");
        dtsearch_catd = catopen (FNAME_DTSRCAT, 0);
     }

diff --git a/cde/lib/DtSearch/dtsrutil.c b/cde/lib/DtSearch/dtsrutil.c
index 7ccc67fdee1e504f238cf552c1b51b36dd13dfb6..33569c8cd4cf6e7c9e7c28aa068312ee491f7a9d 100644 (file)
--- a/cde/lib/DtSearch/dtsrutil.c
+++ b/cde/lib/DtSearch/dtsrutil.c
@@ -66,6 +66,7 @@
  */
 #include "SearchE.h"
 #include <string.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #define MS_misc                1
 

diff --git a/cde/lib/DtSearch/dtsrve.c b/cde/lib/DtSearch/dtsrve.c
index 0f985368eaf7f7359c6c6128a66f970c85e3d25c..d0c7d9f6bed3d9c619439bf38f10925a9ae00a42 100644 (file)
--- a/cde/lib/DtSearch/dtsrve.c
+++ b/cde/lib/DtSearch/dtsrve.c
@@ -75,6 +75,7 @@
  */
 #include "SearchE.h"
 #include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include "vista.h"
@@ -93,6 +94,8 @@ extern time_t   hctree_id;    /**** hardcoded only temporarily ******/
 static int      max_abstrbufsz = 0;
 static int      max_ormisc_size;
 
+char    *strupr(char *);
+
 /************************************************/
 /*                                             */
 /*              dummy_workproc                 */
@@ -669,7 +672,7 @@ static void     store_next_misc (
      * terminate the abstract string in case there are no more misc recs.
      * (but should not occur).
      */
-    if (store_state = STORE_ABSTR)
+    if ((store_state = STORE_ABSTR))
        *targ = 0;
     return;
 }  /* store_next_misc() */

diff --git a/cde/lib/DtSearch/hencode.c b/cde/lib/DtSearch/hencode.c
index 06d95c29d12477aa84b9f04db3710dfab3eee393..c8cdd95add8c65edf7a01326d08ee5c4927ccfbd 100644 (file)
--- a/cde/lib/DtSearch/hencode.c
+++ b/cde/lib/DtSearch/hencode.c
@@ -57,6 +57,7 @@
  */
 #include "SearchP.h"
 #include <errno.h>
+#include <stdlib.h>
 
 #define X_INCLUDE_STRING_H
 #define XOS_USE_NO_LOCKING

diff --git a/cde/lib/DtSearch/iscompat.c b/cde/lib/DtSearch/iscompat.c
index 405bcb11c15ec007adb08df4fed491c243a19ebc..1b717cc9fc6bf57e1210f222c18014b697d51bd6 100644 (file)
--- a/cde/lib/DtSearch/iscompat.c
+++ b/cde/lib/DtSearch/iscompat.c
@@ -51,6 +51,7 @@
  * Name changes for DtSearch.
  */
 #include "SearchP.h"
+#include <stdlib.h>
 
 #define X_INCLUDE_STRING_H
 #define XOS_USE_NO_LOCKING

diff --git a/cde/lib/DtSearch/jpn.c b/cde/lib/DtSearch/jpn.c
index 188fe175c079d159a39f63befaf633e0a4d0f08d..6cb5d5a049a98333fa20b2be7021405bd74c5bd5 100644 (file)
--- a/cde/lib/DtSearch/jpn.c
+++ b/cde/lib/DtSearch/jpn.c
@@ -232,6 +232,7 @@ static UCHAR        *save_parg_string =     NULL;
 static UCHAR   *substrbuf =            NULL;
 static long    substr_offset;
 
+char *ensure_end_slash (char *pathstr);
 
 /************************************************/
 /*                                             */
@@ -311,7 +312,7 @@ static int  read_jchar (void)
            jstate = JS_KANJI;
        else
            jstate = jstates_set1 [(jchar[0] & 0x7F) - 32];
-       if (jchar[1] = readchar (NULL))
+       if ((jchar[1] = readchar (NULL)))
            readcount++;
        else
            jstate = JS_ETX;
@@ -362,7 +363,7 @@ static int  read_jchar (void)
     if (jchar[0] == SS2_CHAR) {
        jcharlen = 2;
        jstate = JS_HALFKATA;
-       if (jchar[1] = readchar (NULL))
+       if ((jchar[1] = readchar (NULL)))
            readcount++;
        else
            jstate = JS_ETX;
@@ -908,7 +909,7 @@ FILL_ANOTHER_SUBSTRING:
      * one by one, ie parse and return word tokens from string,
      * including possible kanji compounds if switched on.
      */
-    if (token = parse_substring())
+    if ((token = parse_substring()))
        return (char *) token;
 
     /* When current substring is empty, go back and fill another one.

diff --git a/cde/lib/DtSearch/lang.c b/cde/lib/DtSearch/lang.c
index 7f254305f258b9d14ed82d38e226a8d30cf909bb..0756fa891fafa1259a3454a41d9aa57a37d63d11 100644 (file)
--- a/cde/lib/DtSearch/lang.c
+++ b/cde/lib/DtSearch/lang.c
@@ -156,6 +156,8 @@ typedef struct prule_t {
     char    is_last_rule;      /* '$' terminate or '>' continue algorithm */
     }  PRULE;
 
+char *ensure_end_slash (char *pathstr);
+void  unload_jpn_language (DBLK *dblk);
 
 /************************************************/
 /*                                             */
@@ -389,7 +391,7 @@ char        *teskey_parser (PARG *parg)
 READ_ANOTHER_WORD:
     outp = outbuf;
     tpstate = BETW_WORDS;
-    while (*outp = cofunction (cofunction_arg)) {
+    while ((*outp = cofunction (cofunction_arg))) {
        readcount++;
        cofunction_arg = NULL;
 
@@ -421,7 +423,7 @@ READ_ANOTHER_WORD:
             * Otherwise discard just like non_concord.
             */
            outp++;
-           if (*outp = cofunction(NULL))
+           if ((*outp = cofunction(NULL)))
                readcount++;
            if ((charmap[*outp] & CONCORDABLE) != 0) {
                *outp = charmap[*outp] & 0x00ff;
@@ -476,7 +478,7 @@ READ_ANOTHER_WORD:
            }
            /* Must be opt_concord... */
            outp++;
-           if (*outp = cofunction(NULL))
+           if ((*outp = cofunction(NULL)))
                readcount++;
            if ((charmap[*outp] & CONCORDABLE) != 0) {
                if (outp < endmaxword) {

diff --git a/cde/lib/DtSearch/msgs.c b/cde/lib/DtSearch/msgs.c
index 1f404435db0ac0a60f1ec5b4ba404f9b803d3925..e9ebb322d1e7d830ae56e9f7e24d14d391345d0e 100644 (file)
--- a/cde/lib/DtSearch/msgs.c
+++ b/cde/lib/DtSearch/msgs.c
@@ -50,6 +50,7 @@
  * Freeze DtSearch 0.1, AusText 2.1.8
  */
 #include "SearchP.h"
+#include <stdlib.h>
 #define PROGNAME       "MSGS"
 
 /****************************************/

diff --git a/cde/lib/DtSearch/objdate.c b/cde/lib/DtSearch/objdate.c
index bd2e52c4dafe1a3e4b182b1c86de8040f9c7ecfd..34e485e580381971251af1444297037e33c21047 100644 (file)
--- a/cde/lib/DtSearch/objdate.c
+++ b/cde/lib/DtSearch/objdate.c
@@ -67,6 +67,7 @@
  */
 
 #include "SearchP.h"
+#include <stdlib.h>
 #define X_INCLUDE_STRING_H
 #define XOS_USE_NO_LOCKING
 #include <X11/Xos_r.h>

diff --git a/cde/lib/DtSearch/ocf.c b/cde/lib/DtSearch/ocf.c
index bd2ad1081c4d2dd8214550f5fe446cdbe1ab757d..3ed7a2810fd9992dd9aa1c10b3b1c580fd025f75 100644 (file)
--- a/cde/lib/DtSearch/ocf.c
+++ b/cde/lib/DtSearch/ocf.c
@@ -102,6 +102,7 @@
  */
 
 #include "SearchE.h"
+#include <ctype.h>
 #include <stdlib.h>
 #define X_INCLUDE_STRING_H
 #define XOS_USE_NO_LOCKING
@@ -110,6 +111,8 @@
 #include <unistd.h>    /* for POSIX getcwd() */
 #include <sys/stat.h>
 
+char    *strupr (char *s);
+
 /*****#define DEBUG_DUMP******/
 /********#define DEBUG_OEF**********/
 
@@ -145,13 +148,13 @@ char           *OE_inittab_dir = NULL;
 ********/
 OEFTAB          oef_table[] =
 {
-    "AUDIT", &OEF_audit, FALSE,
-    "DISCARD", &OEF_discard, FALSE,
-    "NEWS", &OEF_news, FALSE,
-    "NOTESNOT", &OEF_notesnot, FALSE,
-    "NOTESSEM", &OEF_notessem, FALSE,
-    "README", &OEF_readme, FALSE,
-    NULL, NULL, FALSE  /* end of list */
+    { "AUDIT", &OEF_audit, FALSE, },
+    { "DISCARD", &OEF_discard, FALSE, },
+    { "NEWS", &OEF_news, FALSE, },
+    { "NOTESNOT", &OEF_notesnot, FALSE, },
+    { "NOTESSEM", &OEF_notessem, FALSE, },
+    { "README", &OEF_readme, FALSE, },
+    { NULL, NULL, FALSE },     /* end of list */
 };
 
 

diff --git a/cde/lib/DtSearch/opendblk.c b/cde/lib/DtSearch/opendblk.c
index f393639a240a257f99dd59d06a1b5ab9ea46d380..1d95aa83cf4d9300e178b3397581b83b09e93598 100644 (file)
--- a/cde/lib/DtSearch/opendblk.c
+++ b/cde/lib/DtSearch/opendblk.c
@@ -99,6 +99,7 @@
  */
 #include "SearchE.h"
 #include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/cde/lib/DtSearch/raima/alloc.c b/cde/lib/DtSearch/raima/alloc.c
index b856d9698b2707f6ea6f10c96711472a407bba5e..0f67a99f826908847e10b165ca98ef4f3e2be091 100644 (file)
--- a/cde/lib/DtSearch/raima/alloc.c
+++ b/cde/lib/DtSearch/raima/alloc.c
@@ -68,12 +68,10 @@
 
 */
 #include <stdio.h>
+#include <stdlib.h>
 #include "vista.h"
 #include "dbtype.h"
 
-
-char *malloc(P1(unsigned));
-char *calloc(P1(unsigned) Pi(unsigned));
 #define memlock(p)   (p)
 #define memunlock(p) 1
 

diff --git a/cde/lib/DtSearch/raima/cmtype.c b/cde/lib/DtSearch/raima/cmtype.c
index 90004a35f45add334ed4f07622a4ced018f4de56..5a9f25f9b2d81f6d6b0caf794365275406e5a2d7 100644 (file)
--- a/cde/lib/DtSearch/raima/cmtype.c
+++ b/cde/lib/DtSearch/raima/cmtype.c
@@ -51,6 +51,7 @@
 
 /* Get current member type
 */
+int
 d_cmtype(set, cmtype TASK_PARM DBN_PARM)
 int set;
 int FAR *cmtype;

diff --git a/cde/lib/DtSearch/raima/connect.c b/cde/lib/DtSearch/raima/connect.c
index 4166023a4ff7b0a7348a6f9d38dd6bbdff1ca1f3..1af1f63d9db39835ae4fbc635d4e2572106f0025 100644 (file)
--- a/cde/lib/DtSearch/raima/connect.c
+++ b/cde/lib/DtSearch/raima/connect.c
@@ -73,6 +73,7 @@ typedef struct {
 
 /* Connect the current record as member of set
 */
+int
 d_connect(set TASK_PARM DBN_PARM)
 int set; /* Set constant */
 TASK_DECL
@@ -357,8 +358,8 @@ char FAR *mem2; /* member record 2 */
       /* compare the two fields */
       /* computation is pointer to next sort field in member record */
       fld_ptr = &field_table[srt1_ptr->se_fld];
-      if (cmp = fldcmp(fld_ptr, mem1 + fld_ptr->fd_ptr,
-                      mem2 + field_table[srt2_ptr->se_fld].fd_ptr))
+      if ((cmp = fldcmp(fld_ptr, mem1 + fld_ptr->fd_ptr,
+                      mem2 + field_table[srt2_ptr->se_fld].fd_ptr)))
         return (cmp);  /* return at first unequal fields */
    }
    /* fields match */

diff --git a/cde/lib/DtSearch/raima/cotype.c b/cde/lib/DtSearch/raima/cotype.c
index a5c2be5b5c7cb24a56477b60c0a38e3f2dbf3e94..99150a2f296f9ceb1903b1c50d502049f6bc67df 100644 (file)
--- a/cde/lib/DtSearch/raima/cotype.c
+++ b/cde/lib/DtSearch/raima/cotype.c
@@ -50,6 +50,7 @@
 
 /* Get current owner type
 */
+int
 d_cotype(set, cotype TASK_PARM DBN_PARM)
 int set;
 int FAR *cotype;

diff --git a/cde/lib/DtSearch/raima/crget.c b/cde/lib/DtSearch/raima/crget.c
index d1100195bf59f3593b7ad983747e9b81f04b625a..f1a5f0f2c3d1f1f5af3206a0b4c621845ba0540a 100644 (file)
--- a/cde/lib/DtSearch/raima/crget.c
+++ b/cde/lib/DtSearch/raima/crget.c
@@ -49,6 +49,7 @@
 
 /* Get current record
 */
+int
 d_crget(dba TASK_PARM DBN_PARM)
 DB_ADDR FAR *dba; /* db address of record to become current */
 TASK_DECL
@@ -58,7 +59,7 @@ DBN_DECL
 
    if ( ! dbopen ) RETURN( dberr(S_DBOPEN) );
 
-   if ( *dba = curr_rec )
+   if (( *dba = curr_rec ))
       db_status = S_OKAY;
    else
       db_status = S_NOCR;

diff --git a/cde/lib/DtSearch/raima/crread.c b/cde/lib/DtSearch/raima/crread.c
index dbd54e043fe33985fdafbc3f5314ae232a970969..7785ef84207cecdf5f92a9c830aa7cc515b0a8d5 100644 (file)
--- a/cde/lib/DtSearch/raima/crread.c
+++ b/cde/lib/DtSearch/raima/crread.c
@@ -50,6 +50,7 @@
 
 /* Read data from field  of current record
 */
+int
 d_crread(field, data TASK_PARM DBN_PARM)
 long field; /* Field constant */
 char FAR *data; /* Data area to contain field contents */

diff --git a/cde/lib/DtSearch/raima/crset.c b/cde/lib/DtSearch/raima/crset.c
index c75018788c3b7e3202c40599eaf6b286fc3fb868..2155f50f326f61d17b5d20c9851cb3b8c5201e3d 100644 (file)
--- a/cde/lib/DtSearch/raima/crset.c
+++ b/cde/lib/DtSearch/raima/crset.c
@@ -49,6 +49,7 @@
 
 /* Set current record
 */
+int
 d_crset(dba TASK_PARM DBN_PARM)
 DB_ADDR FAR *dba; /* db address of record to become current */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/crtype.c b/cde/lib/DtSearch/raima/crtype.c
index 77c4f2fe0137110ff3b7e39729bc8735a0657e84..175909d382b9771355b4d4b70f3946f2e65bff88 100644 (file)
--- a/cde/lib/DtSearch/raima/crtype.c
+++ b/cde/lib/DtSearch/raima/crtype.c
@@ -49,6 +49,7 @@
 
 /* Get current record type
 */
+int
 d_crtype(crtype TASK_PARM DBN_PARM)
 int FAR *crtype;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/crwrite.c b/cde/lib/DtSearch/raima/crwrite.c
index 9cf838cd2a423a18514bf5be84a350cac601e3b2..f7b408fcedf59879e914d45057e48103f9d45cba 100644 (file)
--- a/cde/lib/DtSearch/raima/crwrite.c
+++ b/cde/lib/DtSearch/raima/crwrite.c
@@ -50,6 +50,7 @@
 
 /* Write data to a field  in the current record
 */
+int
 d_crwrite(field, data TASK_PARM DBN_PARM)
 long field; /* field constant */
 char FAR *data; /* data area to contain field contents */

diff --git a/cde/lib/DtSearch/raima/csmget.c b/cde/lib/DtSearch/raima/csmget.c
index a7c24bd4954770d2b6fc5ef08fb5088c125867f5..ed03ab2e67463c77a377a87f7b31cdfeb844f922 100644 (file)
--- a/cde/lib/DtSearch/raima/csmget.c
+++ b/cde/lib/DtSearch/raima/csmget.c
@@ -49,6 +49,7 @@
 
 /* Get current set member
 */
+int
 d_csmget(set, dba TASK_PARM DBN_PARM)
 int set;      /* Set table entry */
 DB_ADDR FAR *dba; /* db address of record to become current */

diff --git a/cde/lib/DtSearch/raima/csmread.c b/cde/lib/DtSearch/raima/csmread.c
index 35693abb3eb191eb66703c95e932798ed373974c..b52456c1e201d70392600cb405b91297cd642c8f 100644 (file)
--- a/cde/lib/DtSearch/raima/csmread.c
+++ b/cde/lib/DtSearch/raima/csmread.c
@@ -50,6 +50,7 @@
 
 /* Read data from field of current set member
 */
+int
 d_csmread(set, field, data TASK_PARM DBN_PARM)
 int set;    /* Set constant */
 long field; /* Field constant */

diff --git a/cde/lib/DtSearch/raima/csmset.c b/cde/lib/DtSearch/raima/csmset.c
index 4ad741e98ecbbe22eaf868576987c22dd70fca48..f69d1eea34c2d5ec37a3f6e223a167bbab4dcbd8 100644 (file)
--- a/cde/lib/DtSearch/raima/csmset.c
+++ b/cde/lib/DtSearch/raima/csmset.c
@@ -49,6 +49,7 @@
 
 /* Set current set member
 */
+int
 d_csmset(set, dba TASK_PARM DBN_PARM)
 int set;      /* Set table entry */
 DB_ADDR FAR *dba; /* db address of record to become current */

diff --git a/cde/lib/DtSearch/raima/csmwrite.c b/cde/lib/DtSearch/raima/csmwrite.c
index 135a4b3b69a78505104f5892693c2df455e06e2c..3e9cd23f2e33337517a5414c3e330cccc4b67e28 100644 (file)
--- a/cde/lib/DtSearch/raima/csmwrite.c
+++ b/cde/lib/DtSearch/raima/csmwrite.c
@@ -50,6 +50,7 @@
 
 /* Write data to a field in the current set member
 */
+int
 d_csmwrite(set, field, data TASK_PARM DBN_PARM)
 int set;    /* Set constant */
 long field; /* Field constant */

diff --git a/cde/lib/DtSearch/raima/csoget.c b/cde/lib/DtSearch/raima/csoget.c
index e10edffde60ea4c2f6269f98f979be2a33f96401..a5783739e4dfeca3be26a76429bb1cad69b878dc 100644 (file)
--- a/cde/lib/DtSearch/raima/csoget.c
+++ b/cde/lib/DtSearch/raima/csoget.c
@@ -50,6 +50,7 @@
 
 /* Get current set owner
 */
+int
 d_csoget(set, dba TASK_PARM DBN_PARM)
 int set;      /* Set table entry */
 DB_ADDR FAR *dba; /* db address of record to become current */

diff --git a/cde/lib/DtSearch/raima/csoread.c b/cde/lib/DtSearch/raima/csoread.c
index 4568449fdb1516417b7fb53194f52ce9790a3bd9..36a3aa1a1c7334fa84a35d8ca0afcd5c69a103fd 100644 (file)
--- a/cde/lib/DtSearch/raima/csoread.c
+++ b/cde/lib/DtSearch/raima/csoread.c
@@ -50,6 +50,7 @@
 
 /* Read data from field  of current set owner
 */
+int
 d_csoread(set, field, data TASK_PARM DBN_PARM)
 int set;    /* Set constant */
 long field; /* Field constant */

diff --git a/cde/lib/DtSearch/raima/csoset.c b/cde/lib/DtSearch/raima/csoset.c
index 20abc494f77af29ac52b9f56341af4e671a7c354..9255f87be569232f8cedf9a7eb2a744606a283eb 100644 (file)
--- a/cde/lib/DtSearch/raima/csoset.c
+++ b/cde/lib/DtSearch/raima/csoset.c
@@ -50,6 +50,7 @@
 
 /* Set current set owner
 */
+int
 d_csoset(set, dba TASK_PARM DBN_PARM)
 int set;      /* Set table entry */
 DB_ADDR FAR *dba; /* db address of record to become current */

diff --git a/cde/lib/DtSearch/raima/csowrite.c b/cde/lib/DtSearch/raima/csowrite.c
index fd6fd82c103cc9827b4372313de588b96b90e8c8..5124a9777f9d9f1df4fd24845591272801b0b59e 100644 (file)
--- a/cde/lib/DtSearch/raima/csowrite.c
+++ b/cde/lib/DtSearch/raima/csowrite.c
@@ -50,6 +50,7 @@
 
 /* Write data to a field in the current set owner
 */
+int
 d_csowrite(set, field, data TASK_PARM DBN_PARM)
 int set;    /* Set constant */
 long field; /* Field constant */

diff --git a/cde/lib/DtSearch/raima/dbacode.c b/cde/lib/DtSearch/raima/dbacode.c
index b6df959a5137beb74a773cf88fe74d443ee7e9f4..43f3f54723781c24e05835d052dd03fc94a95727 100644 (file)
--- a/cde/lib/DtSearch/raima/dbacode.c
+++ b/cde/lib/DtSearch/raima/dbacode.c
@@ -43,6 +43,7 @@
 
 /* Decode file and slot number from a database address
 */
+int
 d_decode_dba(dba, file, slot)
 DB_ADDR dba;  /* database address */
 int FAR *file;    /* returned file number */
@@ -57,6 +58,7 @@ long FAR *slot;   /* returned slot number */
 
 /* Encode database address from file and slot number
 */
+int
 d_encode_dba(file, slot, dba)
 int file;      /* returned file number */
 long slot;     /* returned slot number */

diff --git a/cde/lib/DtSearch/raima/dbdpath.c b/cde/lib/DtSearch/raima/dbdpath.c
index 692e338e4e0d05e9d8c15b063c9a848cfa1b57bd..d8ac56fea27e3fcd7bb50497dbb49f7152ee3e0e 100644 (file)
--- a/cde/lib/DtSearch/raima/dbdpath.c
+++ b/cde/lib/DtSearch/raima/dbdpath.c
@@ -49,6 +49,7 @@
 
 /* Set Database Dictionary Path
 */
+int
 d_dbdpath(path TASK_PARM)
 CONST char FAR *path;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/dbfpath.c b/cde/lib/DtSearch/raima/dbfpath.c
index 8548b81c771773a2866af2ae0945b9ab92ae0444..ce682e5737bc512b9716318dc5c023ba31e4d3da 100644 (file)
--- a/cde/lib/DtSearch/raima/dbfpath.c
+++ b/cde/lib/DtSearch/raima/dbfpath.c
@@ -49,6 +49,7 @@
 
 /* Set Database Files Path
 */
+int
 d_dbfpath(path TASK_PARM)
 CONST char FAR *path;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/dblfcns.c b/cde/lib/DtSearch/raima/dblfcns.c
index 069d34afa08bc0cccc448dc5a58365da3811bf32..71d0787ff6e9dac07ec4b5d489e6db87060dcce9 100644 (file)
--- a/cde/lib/DtSearch/raima/dblfcns.c
+++ b/cde/lib/DtSearch/raima/dblfcns.c
@@ -275,6 +275,7 @@ TASK_DECL
 
 /* Open db_VISTA database
 */
+int
 d_open(dbnames, opentype TASK_PARM)
 CONST char FAR *dbnames;
 CONST char FAR *opentype;
@@ -441,6 +442,7 @@ TASK FAR *tsk;
 
 /* Initialize multiple database table entries
 */
+int
 initdbt(dbnames )
 CONST char FAR *dbnames;
 {
@@ -901,6 +903,7 @@ static int bld_lock_tables()
 /****************************************/
 /* Close database
 */
+int
 d_close(TASK_ONLY)
 TASK_DECL
 {

diff --git a/cde/lib/DtSearch/raima/dbtype.h b/cde/lib/DtSearch/raima/dbtype.h
index 58ae079d7bb84d686b1380ef24ed8cc6a390cdb8..24e5d9c4f7873dafdb30cc3b9001fa5896c2617a 100644 (file)
--- a/cde/lib/DtSearch/raima/dbtype.h
+++ b/cde/lib/DtSearch/raima/dbtype.h
@@ -627,6 +627,10 @@ typedef struct page_entry {
 } PAGE_ENTRY;
 #define buff Buff.ptr
 
+#include <string.h>
+#ifndef _STRING_H
+#define _STRING_H
+#endif
 #include "proto.h"
 #ifdef MULTI_TASK
 #ifdef NO_DT_COVER

diff --git a/cde/lib/DtSearch/raima/dbuserid.c b/cde/lib/DtSearch/raima/dbuserid.c
index 13f1fc8482c6509539e3cf3b59b4bd020062ce39..c1a6b5739d938f4382229381fc211e8aedb9a791 100644 (file)
--- a/cde/lib/DtSearch/raima/dbuserid.c
+++ b/cde/lib/DtSearch/raima/dbuserid.c
@@ -51,6 +51,7 @@
 
 /* Set Database User Identifier
 */
+int
 d_dbuserid(id TASK_PARM)
 CONST char FAR *id;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/delete.c b/cde/lib/DtSearch/raima/delete.c
index f9988f037ef6bf15bbbe3963b8d965bc48184c50..c7e0b97a96854ad1ae9727e8860ce77d31616da4 100644 (file)
--- a/cde/lib/DtSearch/raima/delete.c
+++ b/cde/lib/DtSearch/raima/delete.c
@@ -52,6 +52,7 @@ static DB_ADDR zap_dba = NULL_DBA;
 
 /* Delete the current record, with error checking
 */
+int
 d_delete(TASK_DBN_ONLY)
 TASK_DECL
 DBN_DECL

diff --git a/cde/lib/DtSearch/raima/destroy.c b/cde/lib/DtSearch/raima/destroy.c
index 00cb9d0c4be81aef03e639048c4bffca4cff3c99..c04e7d2debc70445cb29825302a2bf8d99e33d5c 100644 (file)
--- a/cde/lib/DtSearch/raima/destroy.c
+++ b/cde/lib/DtSearch/raima/destroy.c
@@ -54,6 +54,7 @@
 /* Warning: this function will destroy the entire contents
    of the database
 */
+int
 d_destroy(dbname TASK_PARM)
 CONST char FAR *dbname;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/dio.c b/cde/lib/DtSearch/raima/dio.c
index e3cdd7b15d6b5fe722393e5aee368637ee8773df..aa3258c93a4da34641b8e8d68b71e54bf9e05267 100644 (file)
--- a/cde/lib/DtSearch/raima/dio.c
+++ b/cde/lib/DtSearch/raima/dio.c
@@ -228,6 +228,7 @@ static int dio_in(P1(PAGE_ENTRY FAR *) Pi(LOOKUP_ENTRY FAR *)
 
 /* Set the maximum number of open db_VISTA files
 */
+int
 d_setfiles(num)
 int num;
 {
@@ -242,6 +243,7 @@ int num;
 
 /* Set number of virtual memory pages
 */
+int
 d_setpages(dbpgs, ixpgs)
 int dbpgs; /* # of db cache pages */
 int ixpgs; /* # of index cache pages - ignored in single-user version */
@@ -266,6 +268,7 @@ int ixpgs; /* # of index cache pages - ignored in single-user version */
 /****************************************/
 /* Open a database file
 */
+int
 dio_open( fno )
 FILE_NO fno;
 {
@@ -313,6 +316,7 @@ FILE_NO fno;
 /****************************************/
 /* Close a database file
 */
+int
 dio_close( fno )
 FILE_NO fno;
 {
@@ -335,6 +339,7 @@ FILE_NO fno;
 /****************************************/
 /* Initialize database I/O
 */
+int
 dio_init()
 {
    CHAR_P Tempbuff;
@@ -549,6 +554,7 @@ void dio_free()
 /****************************************/
 /* Clear pages for a single file.
 */
+int
 dio_clrfile(fno )
 register FILE_NO fno;
 {
@@ -564,6 +570,7 @@ register FILE_NO fno;
 /****************************************/
 /* Clear all pages for *all* files from I/O buffer
 */
+int
 dio_clear()
 {
    return( clear_cache(0, size_ft) );
@@ -787,6 +794,7 @@ FILE_NO file_no;
 /****************************************/
 /* Database I/O page get
 */
+int
 dio_get( page_no, page_ptr, hold )
 F_ADDR page_no;
 char FAR * FAR *page_ptr;
@@ -829,6 +837,7 @@ int hold;
 /****************************************/
 /* Set modified flag for a page
 */
+int
 dio_touch( page_no )
 F_ADDR page_no;
 {
@@ -879,6 +888,7 @@ F_ADDR page_no;
  * Merely returns ptr into rec in a page
  * unless a page swap is necessary.
  */
+int
 dio_read( dba, recptr, hold )
 DB_ADDR dba;
 char FAR * FAR *recptr;
@@ -935,6 +945,7 @@ int hold;
  * Sets page's 'touched' flags, timestamps, etc.
  * If recptr not NULL, copies rec to page cache.
  */
+int
 dio_write( dba, recptr, release )
 DB_ADDR dba;
 CONST char FAR *recptr;
@@ -994,6 +1005,7 @@ int release;
 
 /* Release database page hold
 */
+int
 dio_release( dba )
 DB_ADDR dba;
 {
@@ -1130,6 +1142,7 @@ INT rid;
 /****************************************/
 /* Search a cache for page
 */
+int
 dio_findpg(file, page, pg_table, xpg_ptr, xlu_ptr )
 FILE_NO      file;       /* file number = 0..size_ft-1 */
 F_ADDR       page;       /* database page number */
@@ -1435,6 +1448,7 @@ LOOKUP_ENTRY FAR * FAR *xlu_ptr;/* pointer to lookup table slot for found page*/
  * slot is byte swapped before the io by calling the
  * page swap function.
  */
+int
 #ifndef NO_TRANS
 dio_out(pg_ptr, lu_ptr, db_cache)
 #else
@@ -1722,6 +1736,7 @@ static int dio_pzflush()
 /****************************************/
 /* Read a file's page zero
 */
+int
 dio_pzread(fno)
 FILE_NO fno;  /* file number */
 {
@@ -1764,6 +1779,7 @@ FILE_NO fno;  /* file number */
  * ie from delete chain if possible.
  * Returns memory address of the free slot into 'loc'.
  */
+int
 dio_pzalloc(fno, loc )
 FILE_NO fno;    /* file number */
 F_ADDR *loc;    /* pointer to allocated location */
@@ -1831,6 +1847,7 @@ F_ADDR *loc;    /* pointer to allocated location */
 /****************************************/
 /* Delete record slot or key node from page zero
 */
+int
 dio_pzdel(fno, loc )
 FILE_NO fno;  /* file number */
 F_ADDR  loc;  /* location to be freed */

diff --git a/cde/lib/DtSearch/raima/discon.c b/cde/lib/DtSearch/raima/discon.c
index c954dc3c0f2271082c3ce40a8be5475f6dca34e3..20321cc753ad492326a70bcc1c12169f9f10d8de 100644 (file)
--- a/cde/lib/DtSearch/raima/discon.c
+++ b/cde/lib/DtSearch/raima/discon.c
@@ -67,6 +67,7 @@ typedef struct {
 
 /* Disconnect the current member of set
 */
+int
 d_discon(nset TASK_PARM DBN_PARM)
 int nset; /* set number */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/disdel.c b/cde/lib/DtSearch/raima/disdel.c
index 696aa09b1d5a4685409875ad2f516bfdb0818384..125a7ba393fab70914cd212fff95c5484a71204c 100644 (file)
--- a/cde/lib/DtSearch/raima/disdel.c
+++ b/cde/lib/DtSearch/raima/disdel.c
@@ -50,6 +50,7 @@
 
 /* Disconnect from all sets (owner and member) and delete record
 */
+int
 d_disdel(TASK_DBN_ONLY)
 TASK_DECL
 DBN_DECL

diff --git a/cde/lib/DtSearch/raima/fillnew.c b/cde/lib/DtSearch/raima/fillnew.c
index 5a8c954d18c39b73786c3cc0955712399f8b0873..8f96bd2c097332998c7e0282117b4b17877c2b28 100644 (file)
--- a/cde/lib/DtSearch/raima/fillnew.c
+++ b/cde/lib/DtSearch/raima/fillnew.c
@@ -54,6 +54,7 @@
 
 /* Create and fill a new record
 */
+int
 d_fillnew( nrec, recval TASK_PARM DBN_PARM )
 int nrec;       /* record number */
 CONST char FAR *recval; /* record value */

diff --git a/cde/lib/DtSearch/raima/findco.c b/cde/lib/DtSearch/raima/findco.c
index c052998d538f35e6ec4ad5187245571e24bd4ac7..0615ef2aecad9d27911ad07f9ee77499d5b5927d 100644 (file)
--- a/cde/lib/DtSearch/raima/findco.c
+++ b/cde/lib/DtSearch/raima/findco.c
@@ -49,6 +49,7 @@
 
 /* Find owner of current record
 */
+int
 d_findco(nset TASK_PARM DBN_PARM)
 int nset;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/findfm.c b/cde/lib/DtSearch/raima/findfm.c
index 0ab3d8b2a6decaac2c775f7d1b6509127cc23a28..08ee64770dc6fa155c4192ee7866e4112e30fff4 100644 (file)
--- a/cde/lib/DtSearch/raima/findfm.c
+++ b/cde/lib/DtSearch/raima/findfm.c
@@ -49,6 +49,7 @@
 
 /* Find first member of set
 */
+int
 d_findfm(nset TASK_PARM DBN_PARM)
 int nset;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/findlm.c b/cde/lib/DtSearch/raima/findlm.c
index b560e1850d7f79054efafbdc75c3ec20896158f8..016638684530069efac97d7f734de50f4653bb73 100644 (file)
--- a/cde/lib/DtSearch/raima/findlm.c
+++ b/cde/lib/DtSearch/raima/findlm.c
@@ -49,6 +49,7 @@
 
 /* Find last member of set
 */
+int
 d_findlm(nset TASK_PARM DBN_PARM)
 int nset;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/findnm.c b/cde/lib/DtSearch/raima/findnm.c
index 3130b589f70d41c0151f73932af60dd816087653..fb59e27899ebfb6bd1aedb7ad7b3af417eacfd60 100644 (file)
--- a/cde/lib/DtSearch/raima/findnm.c
+++ b/cde/lib/DtSearch/raima/findnm.c
@@ -49,6 +49,7 @@
 
 /* Find next member of set
 */
+int
 d_findnm(nset TASK_PARM DBN_PARM)
 int nset;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/findpm.c b/cde/lib/DtSearch/raima/findpm.c
index cce24e29ed92766145925c52694e9c5c2d8f4caf..f50c6f6b9b3a089347fad3e03690c2cabf2e6757 100644 (file)
--- a/cde/lib/DtSearch/raima/findpm.c
+++ b/cde/lib/DtSearch/raima/findpm.c
@@ -49,6 +49,7 @@
 
 /* Find previous member of set
 */
+int
 d_findpm(nset TASK_PARM DBN_PARM)
 int nset;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/initial.c b/cde/lib/DtSearch/raima/initial.c
index d960d43accd11d8df31835a8838a1a9af39bd56c..beba4985e97a606df84bd37ad0f90769ee28be91 100644 (file)
--- a/cde/lib/DtSearch/raima/initial.c
+++ b/cde/lib/DtSearch/raima/initial.c
@@ -87,6 +87,7 @@ extern int max_open_files;            /* see dio.c */
 
 /* Database initialization function
 */
+int
 d_initialize(TASK_DBN_ONLY)
 TASK_DECL
 DBN_DECL
@@ -111,6 +112,7 @@ DBN_DECL
 
 /* Initialize database file
 */
+int
 d_initfile(fno TASK_PARM DBN_PARM)
 FILE_NO fno; /* file table entry of file to be initialized */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/inittab.c b/cde/lib/DtSearch/raima/inittab.c
index 4bdf6a46824eb73f40b40a91867a438e8d6db7cb..484013b02b05e8292dae2832284f8e1cf5038a9b 100644 (file)
--- a/cde/lib/DtSearch/raima/inittab.c
+++ b/cde/lib/DtSearch/raima/inittab.c
@@ -94,6 +94,7 @@ static int initcurr(P0);
 
 /* Initialize database tables
 */
+int
 inittab()
 {
    register int dbt_lc;                        /* loop control */

diff --git a/cde/lib/DtSearch/raima/ismember.c b/cde/lib/DtSearch/raima/ismember.c
index 8eb09291eb7114a00bfd2fa5cabefd5d7d56da9c..f1fdfa531fdfb4a3b04e3e474674efb392976192 100644 (file)
--- a/cde/lib/DtSearch/raima/ismember.c
+++ b/cde/lib/DtSearch/raima/ismember.c
@@ -50,6 +50,7 @@
 
 /* Check to see if current record is a connected member of SET
 */
+int
 d_ismember(set TASK_PARM DBN_PARM)
 int set;  /* set table entry */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/isowner.c b/cde/lib/DtSearch/raima/isowner.c
index 751e504c20cee3fadd99f405339ff3d415821692..0a55cc03ddb274c45a9c7d2fb9c4b4863bee7a1e 100644 (file)
--- a/cde/lib/DtSearch/raima/isowner.c
+++ b/cde/lib/DtSearch/raima/isowner.c
@@ -50,6 +50,7 @@
 
 /* Check to see if current record is a owner of non-empty SET
 */
+int
 d_isowner(set TASK_PARM DBN_PARM)
 int set;  /* set table entry */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keydel.c b/cde/lib/DtSearch/raima/keydel.c
index 21c829cb2ba19e7e325f33e525f7fd0b59909924..7360dc9368e127be86574cdb8cdc00baa370bb81 100644 (file)
--- a/cde/lib/DtSearch/raima/keydel.c
+++ b/cde/lib/DtSearch/raima/keydel.c
@@ -53,6 +53,7 @@
 
 /* Delete optional key value
 */
+int
 d_keydel(field TASK_PARM DBN_PARM)
 long field; /* key field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keyexist.c b/cde/lib/DtSearch/raima/keyexist.c
index 657b93610f9acddb237e3292a186a50e7c3e086d..659046ee7041ac6e029746ee6d3e011ae999b9e5 100644 (file)
--- a/cde/lib/DtSearch/raima/keyexist.c
+++ b/cde/lib/DtSearch/raima/keyexist.c
@@ -45,6 +45,7 @@
 
 /* Check for optional key existence
 */
+int
 d_keyexist(field TASK_PARM DBN_PARM)
 long field; /* key field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keyfcns.c b/cde/lib/DtSearch/raima/keyfcns.c
index fd510b3338c1c10c22abc6f9804173f604ada64c..7912e4617e58780dd5986c9c8981449e4323f022 100644 (file)
--- a/cde/lib/DtSearch/raima/keyfcns.c
+++ b/cde/lib/DtSearch/raima/keyfcns.c
@@ -149,6 +149,7 @@ static int unique;
 
 /* Open B-tree key field index processing
 */
+int
 key_open()
 {
    register int fd_lc;                 /* loop control */
@@ -234,6 +235,7 @@ void key_close()
 
 /* Initialize key function operation
 */
+int
 key_init(field )
 int field;  /* field number to be processed */
 {
@@ -267,6 +269,7 @@ int field;  /* field number to be processed */
 
 /* Reset key_info last status to reposition keys on file "fno" 
 */
+int
 key_reset(fno )
 FILE_NO fno;
 {
@@ -285,6 +288,7 @@ FILE_NO fno;
 
 /* Locate proper key position on B-tree
 */
+int
 key_locpos(key_val, dba)
 CONST char FAR *key_val; /* key search value */
 DB_ADDR FAR *dba;        /* database address of located key */
@@ -454,6 +458,7 @@ DB_ADDR FAR *dba;     /* database address included in comparison if not null */
 
 /* Scan thru key field
 */
+int
 key_scan(fcn, dba )
 int fcn;       /* next or prev */
 DB_ADDR *dba;  /* db address of scanned record */
@@ -571,6 +576,7 @@ DB_ADDR *dba;
 
 /* Find key boundary
 */
+int
 key_boundary(fcn, dba )
 int  fcn;     /* KEYFRST or KEYLAST */
 DB_ADDR *dba; /* to get dba of first or last key */
@@ -660,6 +666,7 @@ DB_ADDR *dba; /* to get dba of first or last key */
 
 /* Insert key field into B-tree
 */
+int
 key_insert(fld, key_val, dba )
 int fld;      /* key field number */
 CONST char FAR *key_val; /* key value */
@@ -850,6 +857,7 @@ NODE FAR *node;
 
 /* Delete key from B-tree
 */
+int
 key_delete(fld, key_val, dba )
 int fld;
 char CONST FAR *key_val;
@@ -1140,6 +1148,7 @@ int n;
 
 /* Read value of last key scanned
 */
+int
 d_keyread(key_val TASK_PARM)
 char FAR *key_val;
 TASK_DECL
@@ -1214,6 +1223,7 @@ TASK_DECL
 
 /* Build compound key value from record
 */
+int
 key_bldcom(fld, rec, key, cflag )
 int   fld; /* compound key field number */
 char FAR *rec; /* ptr to record data */

diff --git a/cde/lib/DtSearch/raima/keyfind.c b/cde/lib/DtSearch/raima/keyfind.c
index 77db53c71ded6b717f0a97048738f8ff277305db..36ae77ce98867b941cc5da952574a94e9433a248 100644 (file)
--- a/cde/lib/DtSearch/raima/keyfind.c
+++ b/cde/lib/DtSearch/raima/keyfind.c
@@ -56,6 +56,7 @@ static void chk_desc_key(P1(int) Pi(FIELD_ENTRY FAR *)
 
 /* Find record thru key field
 */
+int
 d_keyfind(field, fldval TASK_PARM DBN_PARM)
 long  field;  /* field constant */
 CONST char FAR *fldval; /* value of the data field */

diff --git a/cde/lib/DtSearch/raima/keyfrst.c b/cde/lib/DtSearch/raima/keyfrst.c
index b32c6caf34e207c9114519090d7f5d3f4775245d..d853cffaa33464513cd870b9971a2e48629ceaa1 100644 (file)
--- a/cde/lib/DtSearch/raima/keyfrst.c
+++ b/cde/lib/DtSearch/raima/keyfrst.c
@@ -50,6 +50,7 @@
 
 /* Find first key 
 */
+int
 d_keyfrst(field TASK_PARM DBN_PARM)
 long field;   /* field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keylast.c b/cde/lib/DtSearch/raima/keylast.c
index a013f937a7d77de5bd670d9e1461c73e3db2241a..c8df60c35717c8911104319c88818421bcfa5357 100644 (file)
--- a/cde/lib/DtSearch/raima/keylast.c
+++ b/cde/lib/DtSearch/raima/keylast.c
@@ -50,6 +50,7 @@
 
 /* Find last key 
 */
+int
 d_keylast(field TASK_PARM DBN_PARM)
 long field;   /* field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keynext.c b/cde/lib/DtSearch/raima/keynext.c
index 216f338716d0edc7f006dc17d4f97512cc3f89a3..d83fa7bcc68c010b68fe5c8f800471b3359b22c3 100644 (file)
--- a/cde/lib/DtSearch/raima/keynext.c
+++ b/cde/lib/DtSearch/raima/keynext.c
@@ -51,6 +51,7 @@
 
 /* Find next record thru key field
 */
+int
 d_keynext(field TASK_PARM DBN_PARM)
 long field;  /* field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keyprev.c b/cde/lib/DtSearch/raima/keyprev.c
index 9b5e20753a0dc77bbfafa1de08e257d178b518be..9ea0b4172f07e93ce52d5d052d4e579c8153b323 100644 (file)
--- a/cde/lib/DtSearch/raima/keyprev.c
+++ b/cde/lib/DtSearch/raima/keyprev.c
@@ -51,6 +51,7 @@
 
 /* Find previous record thru key field
 */
+int
 d_keyprev(field TASK_PARM DBN_PARM)
 long field;   /* field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/keystore.c b/cde/lib/DtSearch/raima/keystore.c
index 8434fc0eb5ff72e399bb5f96b8ebedb8e1a08b77..ea6770a6d4b97a2067da94ebf81382b576a462e6 100644 (file)
--- a/cde/lib/DtSearch/raima/keystore.c
+++ b/cde/lib/DtSearch/raima/keystore.c
@@ -52,6 +52,7 @@
 
 /* Store optional key value
 */
+int
 d_keystore(field TASK_PARM DBN_PARM)
 long field; /* key field constant */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/libfcns.c b/cde/lib/DtSearch/raima/libfcns.c
index 1bf5677deadc08f2d031938dad48b50079ff1e0f..db6b866e72d7a6e10369cc583d4ca6d0c0a00be7 100644 (file)
--- a/cde/lib/DtSearch/raima/libfcns.c
+++ b/cde/lib/DtSearch/raima/libfcns.c
@@ -71,6 +71,7 @@ static int ctblcmp(P1(CONST unsigned char FAR*)
 #ifndef         ONE_DB
 /* Check for valid db number and set curr_db, curr_db_table and curr_rn_table
 */
+int
 dbn_check(dbn)
 int dbn;
 {
@@ -93,6 +94,7 @@ int dbn;
 /* Check for valid (external) set number and return (internal) set number
    and set_table pointer.
 */
+int
 nset_check(nset, set, set_ptr )
 register int nset;
 int *set;
@@ -110,6 +112,7 @@ SET_ENTRY FAR * FAR *set_ptr;
 /* Check for valid (external) field number and return (internal) record
    and field numbers and pointers.
 */
+int
 nfld_check(nfld, rec, fld, rec_ptr, fld_ptr )
 long nfld;
 int *rec;
@@ -134,6 +137,7 @@ FIELD_ENTRY FAR * FAR *fld_ptr;
 /* Check for valid (external) record number and return (internal) record
    number and pointer.
 */
+int
 nrec_check(nrec, rec, rec_ptr)
 int nrec;
 int *rec;
@@ -301,7 +305,7 @@ CONST char FAR *f2;   /* pointer to field 2 */
                 (sfld_ptr < fld_max) && (sfld_ptr->fd_flags & STRUCTFLD);
                 ++sfld_ptr) {
               sub_len = cur_len + sfld_ptr->fd_ptr - fld_ptr->fd_ptr;
-              if (k = fldcmp(sfld_ptr, f1 + sub_len, f2 + sub_len))
+              if ((k = fldcmp(sfld_ptr, f1 + sub_len, f2 + sub_len)))
                  return ( k );
            }
         }
@@ -312,7 +316,7 @@ CONST char FAR *f2;   /* pointer to field 2 */
              (--kt_lc >= 0) && (&field_table[key_ptr->kt_key] == fld_ptr);
              ++key_ptr) {
            i = key_ptr->kt_ptr;
-           if ( k = fldcmp(&field_table[key_ptr->kt_field], f1 + i, f2 + i) )
+           if (( k = fldcmp(&field_table[key_ptr->kt_field], f1 + i, f2 + i) ))
               return ( k );
         }
         return ( 0 );
@@ -365,6 +369,7 @@ CONST DB_ADDR FAR *d1, FAR *d2;
 
 /* check for empty DB_ADDR
 */
+int
 null_dba( db_addr )
 CONST char FAR *db_addr;
 {
@@ -377,6 +382,7 @@ CONST char FAR *db_addr;
 
 /* check for valid DB_ADDR
 */
+int
 check_dba( dba )
 DB_ADDR dba;
 {
@@ -419,14 +425,14 @@ int    n;   /* Max. String length */
         f2 = db_global.country_tbl.ptr[*t].sort_as1;
       else f2 = *t;
 
-      if (x = f1 - f2) return(x);
+      if ((x = f1 - f2)) return(x);
  
       /* Check sort_as2-values if sort_as1-values are equal */
       /*----------------------------------------------------*/
       x1 = db_global.country_tbl.ptr[*s].sort_as2;
       x2 = db_global.country_tbl.ptr[*t].sort_as2;
       if ( x1 && x2 ) {  /* We have an entry for char. of both strings */
-        if ( x = x1 - x2 ) return(x);
+        if (( x = x1 - x2 )) return(x);
       }
       else {
         if ( x1 || x2 ) { /* Only sort_as2 value for one string */
@@ -435,21 +441,21 @@ int    n;   /* Max. String length */
               if ( db_global.country_tbl.ptr[*t].sort_as1 )
                  f2 = db_global.country_tbl.ptr[*t].sort_as1;
                else f2 = *t;
-              if ( x = x1 - f2 ) return(x);
+              if (( x = x1 - f2 )) return(x);
            }
            if ( x2 ) {
                *s++;    /* Compare with next character in string 1 */
               if ( db_global.country_tbl.ptr[*s].sort_as1 )
                  f1 = db_global.country_tbl.ptr[*s].sort_as1;
                else f1 = *s;
-              if ( x = f1 - x2 ) return(x);
+              if (( x = f1 - x2 )) return(x);
            }
         }
 
          /* if both are equal compare sub_sort values */
          /*-------------------------------------------*/
-        if (x = db_global.country_tbl.ptr[*s].sub_sort -
-               db_global.country_tbl.ptr[*t].sub_sort)
+        if ((x = db_global.country_tbl.ptr[*s].sub_sort -
+               db_global.country_tbl.ptr[*t].sub_sort))
             return(x);  
       }
       *s++;

diff --git a/cde/lib/DtSearch/raima/makenew.c b/cde/lib/DtSearch/raima/makenew.c
index bb7e4866cc47b2b75654ca8fd989ffd5a66b67d8..ccbac7c3b8c64f1c13651fcd5ef901d0262c786e 100644 (file)
--- a/cde/lib/DtSearch/raima/makenew.c
+++ b/cde/lib/DtSearch/raima/makenew.c
@@ -53,6 +53,7 @@
 
 /* Set the value of a key field
 */
+int
 d_setkey( field, fldvalue TASK_PARM DBN_PARM )
 long field;
 CONST char FAR *fldvalue;
@@ -134,6 +135,7 @@ int sk_free()
 
 /* Create a new empty record
 */
+int
 d_makenew( nrec TASK_PARM DBN_PARM )
 int nrec;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/members.c b/cde/lib/DtSearch/raima/members.c
index cc0fc70703a6f96703869674db2d52d3cfda8141..cbdf3cd9fe63c0a2fc6d0a70518a84c2c68ef277 100644 (file)
--- a/cde/lib/DtSearch/raima/members.c
+++ b/cde/lib/DtSearch/raima/members.c
@@ -50,6 +50,7 @@
 
 /* Get number of members of the current set owner
 */
+int
 d_members(set, tot TASK_PARM DBN_PARM)
 int set;     /* Set table entry */
 LONG FAR *tot;   /* total members of set */

diff --git a/cde/lib/DtSearch/raima/opens.c b/cde/lib/DtSearch/raima/opens.c
index a22f287928b112274f4cf78c0573092c8979540d..35b6f11989187b48cae55bee022a810147a3fa28 100644 (file)
--- a/cde/lib/DtSearch/raima/opens.c
+++ b/cde/lib/DtSearch/raima/opens.c
@@ -49,6 +49,7 @@
 
 #include <stdio.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include "vista.h"
 #ifdef MSC
 #include <share.h>

diff --git a/cde/lib/DtSearch/raima/options.c b/cde/lib/DtSearch/raima/options.c
index 909e16bd97bda3e275aaa1119bc7f5de67799330..f0d15f6f937330ed62768e9cb170c7fc68c03c1b 100644 (file)
--- a/cde/lib/DtSearch/raima/options.c
+++ b/cde/lib/DtSearch/raima/options.c
@@ -43,6 +43,7 @@
 
 /* Turn on db_VISTA runtime options
 */
+int
 d_on_opt(optflag TASK_PARM)
 int optflag;
 TASK_DECL
@@ -75,6 +76,7 @@ TASK_DECL
 
 /* Turn off db_VISTA runtime options
 */
+int
 d_off_opt(optflag TASK_PARM)
 int optflag;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/recfcns.c b/cde/lib/DtSearch/raima/recfcns.c
index 523d1e965840d2c7070723a8ee930008c18a0644..79a4dac7ec0eca34d130f1b3c24dbe856a2c195b 100644 (file)
--- a/cde/lib/DtSearch/raima/recfcns.c
+++ b/cde/lib/DtSearch/raima/recfcns.c
@@ -70,6 +70,7 @@ static int struct_key_chk = 1;
 
 /* Check a field for permission to change it
 */
+int
 r_chkfld(field, fld_ptr, rec, data )
 INT field;  /* field_table entry number */
 FIELD_ENTRY FAR *fld_ptr; /* corresponds to field */
@@ -138,6 +139,7 @@ CONST char FAR *data; /* pointer to data area containing field contents */
 
 /* Delete the current record
 */
+int
 r_delrec( rt, db_addr )
 INT rt;
 DB_ADDR db_addr;
@@ -197,6 +199,7 @@ DB_ADDR db_addr;
 
 /* Get data field from record
 */
+int
 r_gfld(fld_ptr, rec, data )
 FIELD_ENTRY FAR *fld_ptr;
 char FAR *rec;  /* pointer to record */
@@ -250,6 +253,7 @@ char FAR *data; /* pointer to data area to contain field contents */
 
 /* Get member pointer from record
 */
+int
 r_gmem(set, rec, mem_addr )
 int set;    /* set table entry number */
 char FAR *rec;  /* pointer to record */
@@ -281,6 +285,7 @@ char FAR *mem_addr; /* pointer to member pointer */
 
 /* Get set pointer from record
 */
+int
 r_gset(set, rec, setptr )
 int set;      /* set table entry number */
 char FAR *rec;    /* pointer to record */
@@ -308,6 +313,7 @@ char FAR *setptr; /* pointer to set pointer */
 
 /* Put data field into record
 */
+int
 r_pfld(field, fld_ptr, rec, data, db_addr )
 INT field;  /* field_table entry number */
 FIELD_ENTRY FAR *fld_ptr; /* corresponds to field */
@@ -431,6 +437,7 @@ DB_ADDR FAR *db_addr;
 
 /* Put member pointer into record
 */
+int
 r_pmem(set, rec, mem_addr )
 int set;    /* set table entry number */
 char FAR *rec;  /* pointer to record */
@@ -462,6 +469,7 @@ char FAR *mem_addr; /* pointer to member pointer */
 
 /* Put set pointer into record
 */
+int
 r_pset(set, rec, setptr )
 int set;       /* set table entry number */
 char FAR *rec;     /* pointer to record */
@@ -491,6 +499,7 @@ char FAR *setptr;  /* pointer to set pointer */
 
 /* Set the current set member from record
 */
+int
 r_smem( db_addr, set )
 DB_ADDR FAR *db_addr;
 INT set;
@@ -528,6 +537,7 @@ INT set;
 }
 
 /* Set the optional key field "stored" bit */
+int
 r_setopt( fld_ptr, rec )
 FIELD_ENTRY FAR *fld_ptr; /* field table entry of optional key */
 char FAR *rec; /* Pointer to record */
@@ -555,6 +565,7 @@ char FAR *rec;      /* Pointer to record */
 }
 
 /* Clear the optional key field "stored" bit */
+int
 r_clropt( fld_ptr, rec )
 FIELD_ENTRY FAR *fld_ptr;      /* Field table entry of optional key */
 char FAR *rec; /* Pointer to record */
@@ -582,6 +593,7 @@ char FAR *rec;      /* Pointer to record */
 }
 
 /* Test the optional key field "stored" bit */
+int
 r_tstopt( fld_ptr, rec )
 FIELD_ENTRY FAR *fld_ptr;      /* Field table entry of optional key */
 char FAR *rec; /* Pointer to record */

diff --git a/cde/lib/DtSearch/raima/recfrst.c b/cde/lib/DtSearch/raima/recfrst.c
index c7466ff285e521969bf9640bcd2f7a030bf97b71..bd52965c86c64ae45169e9042fe433c1a88f1917 100644 (file)
--- a/cde/lib/DtSearch/raima/recfrst.c
+++ b/cde/lib/DtSearch/raima/recfrst.c
@@ -48,6 +48,7 @@
 
 /* Find first record of type
 */
+int
 d_recfrst( rec TASK_PARM DBN_PARM )
 int rec;       /* record type/table entry */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/recnext.c b/cde/lib/DtSearch/raima/recnext.c
index c16fde31a9608aa2724d4fab22aab4d27def7443..39b344690382e2b61e792e1130aed60d2394d617 100644 (file)
--- a/cde/lib/DtSearch/raima/recnext.c
+++ b/cde/lib/DtSearch/raima/recnext.c
@@ -49,6 +49,7 @@
 
 /* Find next record of type
 */
+int
 d_recnext(TASK_DBN_ONLY)
 TASK_DECL
 DBN_DECL

diff --git a/cde/lib/DtSearch/raima/recread.c b/cde/lib/DtSearch/raima/recread.c
index 5975f41bf14639f97a2261998226c3ac6e0ab162..18c9e1f5de90bd3fbefa8505798f8308fd1b5bcf 100644 (file)
--- a/cde/lib/DtSearch/raima/recread.c
+++ b/cde/lib/DtSearch/raima/recread.c
@@ -51,6 +51,7 @@
 
 /* Read contents of current record
 */
+int
 d_recread(rec TASK_PARM DBN_PARM)
 char FAR *rec; /* ptr to record area */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/recwrite.c b/cde/lib/DtSearch/raima/recwrite.c
index 7b3c518ca6a16439f945cdbd4e0a62d24ade44fb..6c5de2c01e3477631d5aae3ed620c23c1545847f 100644 (file)
--- a/cde/lib/DtSearch/raima/recwrite.c
+++ b/cde/lib/DtSearch/raima/recwrite.c
@@ -51,6 +51,7 @@
 
 /* Write contents to current record
 */
+int
 d_recwrite(rec TASK_PARM DBN_PARM)
 CONST char FAR *rec; /* ptr to record area */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/renfile.c b/cde/lib/DtSearch/raima/renfile.c
index a735c82e1e4184a59fb85c68036ac90dd29b291b..2dbf56e001868a8d2823919b462c0db7b2864a7e 100644 (file)
--- a/cde/lib/DtSearch/raima/renfile.c
+++ b/cde/lib/DtSearch/raima/renfile.c
@@ -46,6 +46,7 @@
 
 /* Rename database file
 */
+int
 d_renfile(dbn, fno, fnm TASK_PARM)
 CONST char FAR *dbn;  /* database containing file to be renamed */
 FILE_NO fno;  /* file id number for file to be renamed */
@@ -86,6 +87,7 @@ TASK_DECL
 
 /* Process renamed file table
 */
+int
 renfiles()
 {
    register int dbt_lc;                        /* loop control */

diff --git a/cde/lib/DtSearch/raima/rwcurr.c b/cde/lib/DtSearch/raima/rwcurr.c
index fad53b5863987658aec60fe76864a9a606089681..c14d7ef64cb7bdf875b2564d718211230468dc4e 100644 (file)
--- a/cde/lib/DtSearch/raima/rwcurr.c
+++ b/cde/lib/DtSearch/raima/rwcurr.c
@@ -57,6 +57,7 @@ static DB_ADDR_P Cb = POINTER_INIT();
 
 /* Read currency table
 */
+int
 d_rdcurr(currbuff, currsize TASK_PARM)
 DB_ADDR **currbuff;
 int FAR *currsize;
@@ -106,6 +107,7 @@ TASK_DECL
 
 /* Write currency table
 */
+int
 d_wrcurr(currbuff TASK_PARM)
 DB_ADDR *currbuff;
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/setdb.c b/cde/lib/DtSearch/raima/setdb.c
index 3aae5bc632f1d69162597891747bd30e1fbfebec..818c58c57de4573f3dea384e3e3e8a70731d02cf 100644 (file)
--- a/cde/lib/DtSearch/raima/setdb.c
+++ b/cde/lib/DtSearch/raima/setdb.c
@@ -52,6 +52,7 @@
 #ifndef         ONE_DB
 /* Set current database
 */
+int
 d_setdb(dbn TASK_PARM)
 int dbn;   /* database number */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/setmm.c b/cde/lib/DtSearch/raima/setmm.c
index 45ee51898faada2654dd851c5de4d50bb69790dd..3265b0134c09559325df3b75cf658488ca1d7db7 100644 (file)
--- a/cde/lib/DtSearch/raima/setmm.c
+++ b/cde/lib/DtSearch/raima/setmm.c
@@ -49,6 +49,7 @@
 
 /* Set current member to current member
 */
+int
 d_setmm(sett, sets TASK_PARM DBN_PARM)
 int sett;   /* set table entry number of target member */
 int sets;   /* set table entry number of source member */

diff --git a/cde/lib/DtSearch/raima/setmo.c b/cde/lib/DtSearch/raima/setmo.c
index c0ad2ba563cd1318430d892d0389efbe2f681a7c..869c6b804f3a0da6e348fbc3d034d1411b3ef2eb 100644 (file)
--- a/cde/lib/DtSearch/raima/setmo.c
+++ b/cde/lib/DtSearch/raima/setmo.c
@@ -49,6 +49,7 @@
 
 /* Set current member to current owner
 */
+int
 d_setmo(setm, seto TASK_PARM DBN_PARM)
 int setm;   /* set table entry number of member */
 int seto;   /* set table entry number of owner */

diff --git a/cde/lib/DtSearch/raima/setmr.c b/cde/lib/DtSearch/raima/setmr.c
index a6853de3ab9208a307dc4f33a5c748728d84389b..9364e984a767fd81e495da52d9741ef23e2367dd 100644 (file)
--- a/cde/lib/DtSearch/raima/setmr.c
+++ b/cde/lib/DtSearch/raima/setmr.c
@@ -49,6 +49,7 @@
 
 /* Set current member to current record
 */
+int
 d_setmr(set TASK_PARM DBN_PARM)
 int set;   /* set table entry number */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/setom.c b/cde/lib/DtSearch/raima/setom.c
index d8052061f0bb04c75e6c7acb9364d242eda131de..4542c3a7cd8c1cfada2ea10a326c537b04d7f95d 100644 (file)
--- a/cde/lib/DtSearch/raima/setom.c
+++ b/cde/lib/DtSearch/raima/setom.c
@@ -50,6 +50,7 @@
 
 /* Set current owner to current member
 */
+int
 d_setom(nseto, nsetm TASK_PARM DBN_PARM)
 int nseto;   /* set table entry number of owner */
 int nsetm;   /* set table entry number of member */

diff --git a/cde/lib/DtSearch/raima/setoo.c b/cde/lib/DtSearch/raima/setoo.c
index af508f9228813ff51fb991b614f342aef7f69d73..ea3128af410211e67a610c5a1e9d4cce87430da7 100644 (file)
--- a/cde/lib/DtSearch/raima/setoo.c
+++ b/cde/lib/DtSearch/raima/setoo.c
@@ -50,6 +50,7 @@
 
 /* Set current owner to current owner
 */
+int
 d_setoo(nsett, nsets TASK_PARM DBN_PARM)
 int nsett;   /* set table entry number of target owner */
 int nsets;   /* set table entry number of source owner */

diff --git a/cde/lib/DtSearch/raima/setor.c b/cde/lib/DtSearch/raima/setor.c
index 47635bde47bbbd6576c101600b7435081fb59364..106ca4854aae2e31b4ae498a56011a770a83fba2 100644 (file)
--- a/cde/lib/DtSearch/raima/setor.c
+++ b/cde/lib/DtSearch/raima/setor.c
@@ -49,6 +49,7 @@
 
 /* Set current owner to current record
 */
+int
 d_setor(nset TASK_PARM DBN_PARM)
 int nset;  /* set number */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/setrm.c b/cde/lib/DtSearch/raima/setrm.c
index c47bf6c0e5431b9cb4f31138a939e99477ad80a3..6d823261f0eb5daf6155170c280a41dc05e1fbb8 100644 (file)
--- a/cde/lib/DtSearch/raima/setrm.c
+++ b/cde/lib/DtSearch/raima/setrm.c
@@ -49,6 +49,7 @@
 
 /* Set current record to current member
 */
+int
 d_setrm(set TASK_PARM DBN_PARM)
 int set;   /* set table entry number */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/setro.c b/cde/lib/DtSearch/raima/setro.c
index c898523f679f204215e46f7e1fd5e8a6121b9aff..6c689c6f0e654dd8f4870ab5645b158e6fafdea3 100644 (file)
--- a/cde/lib/DtSearch/raima/setro.c
+++ b/cde/lib/DtSearch/raima/setro.c
@@ -49,6 +49,7 @@
 
 /* Set current record to current owner
 */
+int
 d_setro(set TASK_PARM DBN_PARM)
 int set;   /* set table entry number */
 TASK_DECL

diff --git a/cde/lib/DtSearch/raima/vista.h b/cde/lib/DtSearch/raima/vista.h
index 5e79dfe577b6ac51edb16ea1fa03cdc41582181a..ee29579e56bda15ab57a7524a5b059737a6e2874 100644 (file)
--- a/cde/lib/DtSearch/raima/vista.h
+++ b/cde/lib/DtSearch/raima/vista.h
@@ -395,4 +395,5 @@ typedef struct {
 #ifdef MULTI_TASK
 #include "task.h"
 #endif
+
 /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC vista.h */

diff --git a/cde/lib/DtSearch/readchar.c b/cde/lib/DtSearch/readchar.c
index 14e4c7d2cd6a700179e94f24eda1c8e1ebdd465c..438444a28e7bfef43c8fb698c6b87e79f173a38c 100644 (file)
--- a/cde/lib/DtSearch/readchar.c
+++ b/cde/lib/DtSearch/readchar.c
@@ -59,6 +59,7 @@
  * Initial revision
  */
 #include "SearchP.h"
+#include <stdlib.h>
 #include <string.h>
 
 #define PROGNAME       "READCHAR"

diff --git a/cde/lib/DtSearch/vedelete.c b/cde/lib/DtSearch/vedelete.c
index d32168f1d01190fb34fa0ace9da88e7c28b86c72..c77b2817e134adc52a3287bf0ba4cabef1af0f38 100644 (file)
--- a/cde/lib/DtSearch/vedelete.c
+++ b/cde/lib/DtSearch/vedelete.c
@@ -63,6 +63,7 @@
  */
 #include "SearchE.h"
 #include <ctype.h>
+#include <stdlib.h>
 #include "vista.h"
 
 #define PROGNAME       "VEDELETE"

diff --git a/cde/lib/DtSearch/vestatis.c b/cde/lib/DtSearch/vestatis.c
index a1c23f928702e3e9caad1466cbac4f05288bbbb5..bf4372318e8fe81325b55b78cb3d6309dd8fab5d 100644 (file)
--- a/cde/lib/DtSearch/vestatis.c
+++ b/cde/lib/DtSearch/vestatis.c
@@ -96,6 +96,7 @@
 #define        MEMORY_SIZE     64000   /* 65536 is 64 KBytes of memory */
 #define REC_TYPES       256
 #define NORM_VALUE      30
+#undef INFINITY /* XXX does GCC's __builtin_inff() work here? */
 #define INFINITY        9999.0
 #define        SORT_MESG       10000
 #define        CHAR_BITS       8