debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libDtSearch: Remove optional support for ancient DOS far pointer

Browse Source
This commit is contained in:
Peter Howkins
2018-06-28 18:59:15 +01:00
parent 94e69a00a7
commit 144bca4af7
97 changed files with 1018 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cde/lib/DtSearch/raima/keydel.c
View File

@@ -61,16 +61,16 @@ DBN_DECL /* database number */
{
int fld; /* field number */
int rec, rn; /* record type of current record */
char FAR *rptr; /* pointer to current record */
CONST char FAR *fptr; /* pointer to field contents */
char *rptr; /* pointer to current record */
CONST char *fptr; /* pointer to field contents */
char ckey[256]; /* compound key data */
int stat;
RECORD_ENTRY FAR *rec_ptr;
FIELD_ENTRY FAR *fld_ptr;
RECORD_ENTRY *rec_ptr;
FIELD_ENTRY *fld_ptr;
DB_ENTER(DB_ID TASK_ID LOCK_SET(RECORD_IO));
if (nfld_check(field, &rec, &fld, (RECORD_ENTRY FAR * FAR *)&rec_ptr, (FIELD_ENTRY FAR * FAR *)&fld_ptr) != S_OKAY)
if (nfld_check(field, &rec, &fld, (RECORD_ENTRY * *)&rec_ptr, (FIELD_ENTRY * *)&fld_ptr) != S_OKAY)
RETURN( db_status );
/* ensure current record is valid for this field */
@@ -84,7 +84,7 @@ DBN_DECL /* database number */
RETURN( dberr(S_NOTOPTKEY) );
/* read current record */
if ( (stat = dio_read(curr_rec, (char FAR * FAR *)&rptr, PGHOLD)) == S_OKAY ) {
if ( (stat = dio_read(curr_rec, (char * *)&rptr, PGHOLD)) == S_OKAY ) {
/* Make sure that the key has been stored */
if ( r_tstopt( fld_ptr, rptr ) == S_OKAY ) {
if ( dio_release( curr_rec ) != S_OKAY )