From e5b3c011c64ab00cc00b771d203f8d1809ca846d Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Fri, 29 Jun 2018 00:15:06 +0100 Subject: [PATCH] libDtSearch: Remove optional code for NO_DBN which is not used on CDE --- cde/lib/DtSearch/raima/dbtype.h | 18 ------ cde/lib/DtSearch/raima/proto.h | 4 -- cde/lib/DtSearch/raima/startup.c | 2 - cde/lib/DtSearch/raima/task.h | 97 -------------------------------- cde/lib/DtSearch/raima/vista.h | 22 -------- 5 files changed, 143 deletions(-) diff --git a/cde/lib/DtSearch/raima/dbtype.h b/cde/lib/DtSearch/raima/dbtype.h index 36ae28b9..1e5cc541 100644 --- a/cde/lib/DtSearch/raima/dbtype.h +++ b/cde/lib/DtSearch/raima/dbtype.h @@ -355,18 +355,11 @@ typedef struct RN_ENTRY_S { #define NUM2INT(num, offset) ((num) + db_global.Curr_db_table->offset) #define NUM2EXT(num, offset) ((num) - db_global.Curr_db_table->offset) #define ORIGIN(offset) (curr_db_table->offset) -#ifndef NO_DBN #define CURR_DB_PARM , curr_db #define DBN_PARM , dbn #define DBN_ONLY dbn #define DBN_DECL int dbn; #else -#define CURR_DB_PARM /**/ -#define DBN_PARM /**/ -#define DBN_ONLY /**/ -#define DBN_DECL /**/ -#endif -#else #define DB_REF(item) (db_global.item) #define RN_REF(item) (db_global.item) #define NUM2INT(num, offset) (num) @@ -515,11 +508,6 @@ typedef struct MESSAGE_S { #endif /* GENERAL */ } MESSAGE; -#ifdef ONE_DB -#define NO_DBN -#endif - -#ifndef NO_DBN /* NO_DBN */ #ifdef COMMA /* COMMA */ #define DB_ID , dbn #define NO_DB_ID , -1 @@ -530,12 +518,6 @@ typedef struct MESSAGE_S { #define DBN_PARAM b #define COMMA #endif /* COMMA */ -#else /* NO_DBN */ -#define DBN_PARAM /**/ -#define DB_ID /**/ -#define DB_PARM /**/ -#define NO_DB_ID /**/ -#endif /* NO_DBN */ #define TASK_PARAM /**/ #define TASK_ID /**/ diff --git a/cde/lib/DtSearch/raima/proto.h b/cde/lib/DtSearch/raima/proto.h index 02e251c3..5a2fdeb7 100644 --- a/cde/lib/DtSearch/raima/proto.h +++ b/cde/lib/DtSearch/raima/proto.h @@ -288,11 +288,7 @@ char * get_element(P1(char *) Pi(int)); int renfiles(P0); /* From startup.c: */ -#ifndef NO_DBN_PARM int startup(DBN_FIX_D1 TASK_PTR_Di LOCK_Di); -#else -#define startup() S_OKAY -#endif /* From taffcns.c: */ int taf_open(P0); diff --git a/cde/lib/DtSearch/raima/startup.c b/cde/lib/DtSearch/raima/startup.c index e60c13d1..58f93ab6 100644 --- a/cde/lib/DtSearch/raima/startup.c +++ b/cde/lib/DtSearch/raima/startup.c @@ -56,12 +56,10 @@ LOCK_DECL taskinit(&db_global); db_glob_init = 1; } -#ifndef NO_DBN_PARM #ifndef ONE_DB if ( dbn >= 0 && dbn_check(dbn) != S_OKAY ) { return( db_status ); } -#endif #endif return( db_status ); } diff --git a/cde/lib/DtSearch/raima/task.h b/cde/lib/DtSearch/raima/task.h index 4702070f..a743bfb0 100644 --- a/cde/lib/DtSearch/raima/task.h +++ b/cde/lib/DtSearch/raima/task.h @@ -463,102 +463,6 @@ int EXTERNAL_DBN dt_utscs(P1(int) Pi(ULONG *) TASK_Di DBN_Dn); #define d_utscr(a) dt_utscr(a CURRTASK_PARM) #endif -#ifdef NO_DBN_PARM -#define d_cmstat(a) dt_cmstat(a CURRTASK_PARM) -#define d_cmtype(a, b) dt_cmtype(a, b CURRTASK_PARM) -#define d_connect(a) dt_connect(a CURRTASK_PARM) -#ifndef NO_TIMESTAMP -#define d_costat(a) dt_costat(a CURRTASK_PARM) -#endif -#define d_cotype(a, b) dt_cotype(a, b CURRTASK_PARM) -#define d_crget(a) dt_crget(a CURRTASK_PARM) -#define d_crread(a, b) dt_crread(a, b CURRTASK_PARM) -#define d_crset(a) dt_crset(a CURRTASK_PARM) -#define d_crtype(a) dt_crtype(a CURRTASK_PARM) -#define d_crwrite(a, b) dt_crwrite(a, b CURRTASK_PARM) -#define d_csmget(a, b) dt_csmget(a, b CURRTASK_PARM) -#define d_csmread(a, b, c) dt_csmread(a, b, c CURRTASK_PARM) -#define d_csmset(a, b) dt_csmset(a, b CURRTASK_PARM) -#define d_csmwrite(a, b, c) dt_csmwrite(a, b, c CURRTASK_PARM) -#define d_csoget(a, b) dt_csoget(a, b CURRTASK_PARM) -#define d_csoread(a, b, c) dt_csoread(a, b, c CURRTASK_PARM) -#define d_csoset(a, b) dt_csoset(a, b CURRTASK_PARM) -#define d_csowrite(a, b, c) dt_csowrite(a, b, c CURRTASK_PARM) -#ifndef NO_TIMESTAMP -#define d_csstat(a) dt_csstat(a CURRTASK_PARM) -#define d_ctscm(a, b) dt_ctscm(a, b CURRTASK_PARM) -#define d_ctsco(a, b) dt_ctsco(a, b CURRTASK_PARM) -#define d_ctscr(a) dt_ctscr(a CURRTASK_PARM) -#endif -#define d_delete() dt_delete(CURRTASK_ONLY) -#define d_disdel() dt_disdel(CURRTASK_ONLY) -#define d_recnext() dt_recnext(CURRTASK_ONLY) -#define d_recprev() dt_recprev(CURRTASK_ONLY) -#define d_discon(a) dt_discon(a CURRTASK_PARM) -#define d_fillnew(a, b) dt_fillnew(a, b CURRTASK_PARM) -#define d_findco(a) dt_findco(a CURRTASK_PARM) -#define d_findfm(a) dt_findfm(a CURRTASK_PARM) -#define d_findlm(a) dt_findlm(a CURRTASK_PARM) -#define d_findnm(a) dt_findnm(a CURRTASK_PARM) -#define d_findpm(a) dt_findpm(a CURRTASK_PARM) -#ifndef NO_TIMESTAMP -#define d_gtscm(a, b) dt_gtscm(a, b CURRTASK_PARM) -#define d_gtsco(a, b) dt_gtsco(a, b CURRTASK_PARM) -#define d_gtscs(a, b) dt_gtscs(a, b CURRTASK_PARM) -#endif -#define d_initialize() dt_initialize(CURRTASK_ONLY) -#define d_initfile(a) dt_initfile(a CURRTASK_PARM) -#define d_ismember(a) dt_ismember(a CURRTASK_PARM) -#define d_isowner(a) dt_isowner(a CURRTASK_PARM) -#define d_keydel(a) dt_keydel(a CURRTASK_PARM) -#define d_keyexist(a) dt_keyexist(a CURRTASK_PARM) -#define d_keyfind(a, b) dt_keyfind(a, b CURRTASK_PARM) -#define d_keyfree(a) dt_keyfree(a CURRTASK_PARM) -#define d_keyfrst(a) dt_keyfrst(a CURRTASK_PARM) -#define d_keylast(a) dt_keylast(a CURRTASK_PARM) -#define d_keylock(a, b) dt_keylock(a, b CURRTASK_PARM) -#define d_keylstat(a, b) dt_keylstat(a, b CURRTASK_PARM) -#define d_keynext(a) dt_keynext(a CURRTASK_PARM) -#define d_keyprev(a) dt_keyprev(a CURRTASK_PARM) -#define d_keyread(a) dt_keyread(a CURRTASK_PARM) -#define d_keystore(a) dt_keystore(a CURRTASK_PARM) -#define d_lock(a, b) dt_lock(a, b CURRTASK_PARM) -#define d_makenew(a) dt_makenew(a CURRTASK_PARM) -#define d_members(a, b) dt_members(a, b CURRTASK_PARM) -#define d_recfree(a) dt_recfree(a CURRTASK_PARM) -#define d_recfrst(a) dt_recfrst(a CURRTASK_PARM) -#define d_reclast(a) dt_reclast(a CURRTASK_PARM) -#define d_reclock(a, b) dt_reclock(a, b CURRTASK_PARM) -#define d_reclstat(a, b) dt_reclstat(a, b CURRTASK_PARM) -#define d_recread(a) dt_recread(a CURRTASK_PARM) -#define d_recset(a) dt_recset(a CURRTASK_PARM) -#define d_recwrite(a) dt_recwrite(a CURRTASK_PARM) -#define d_setfree(a) dt_setfree(a CURRTASK_PARM) -#define d_setkey(a, b) dt_setkey(a, b CURRTASK_PARM) -#define d_setlock(a, b) dt_setlock(a, b CURRTASK_PARM) -#define d_setlstat(a, b) dt_setlstat(a, b CURRTASK_PARM) -#define d_setmm(a, b) dt_setmm(a, b CURRTASK_PARM) -#define d_setmo(a, b) dt_setmo(a, b CURRTASK_PARM) -#define d_setmr(a) dt_setmr(a CURRTASK_PARM) -#define d_setom(a, b) dt_setom(a, b CURRTASK_PARM) -#define d_setoo(a, b) dt_setoo(a, b CURRTASK_PARM) -#define d_setor(a) dt_setor(a CURRTASK_PARM) -#define d_setrm(a) dt_setrm(a CURRTASK_PARM) -#define d_setro(a) dt_setro(a CURRTASK_PARM) -#ifndef NO_TIMESTAMP -#define d_stscm(a, b) dt_stscm(a, b CURRTASK_PARM) -#define d_stsco(a, b) dt_stsco(a, b CURRTASK_PARM) -#define d_stscr(a) dt_stscr(a CURRTASK_PARM) -#define d_stscs(a, b) dt_stscs(a, b CURRTASK_PARM) -#endif -#ifndef NO_TIMESTAMP -#define d_utscm(a, b) dt_utscm(a, b CURRTASK_PARM) -#define d_utsco(a, b) dt_utsco(a, b CURRTASK_PARM) -#define d_utscs(a, b) dt_utscs(a, b CURRTASK_PARM) -#endif - -#else /* NO_DBN_PARM */ - #define d_cmstat(a DBN_PARM) dt_cmstat(a CURRTASK_PARM DBN_PARM) #define d_cmtype(a, b DBN_PARM) dt_cmtype(a, b CURRTASK_PARM DBN_PARM) #define d_connect(a DBN_PARM) dt_connect(a CURRTASK_PARM DBN_PARM) @@ -651,7 +555,6 @@ int EXTERNAL_DBN dt_utscs(P1(int) Pi(ULONG *) TASK_Di DBN_Dn); #define d_utsco(a, b DBN_PARM) dt_utsco(a, b CURRTASK_PARM DBN_PARM) #define d_utscs(a, b DBN_PARM) dt_utscs(a, b CURRTASK_PARM DBN_PARM) #endif -#endif /* NO_DBN_PARM */ #endif /* NO_DT_COVER */ /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC task.h */ diff --git a/cde/lib/DtSearch/raima/vista.h b/cde/lib/DtSearch/raima/vista.h index 8ac41852..eae4271c 100644 --- a/cde/lib/DtSearch/raima/vista.h +++ b/cde/lib/DtSearch/raima/vista.h @@ -289,16 +289,6 @@ extern int db_oflag; typedef int (PASCAL *FARPROC)(); typedef char *HANDLE; -#ifdef NO_DBN_PARM -#ifdef DBN_IN_LIB -#define EXTERNAL_DBN EXTERNAL_VARIABLE -#else -#define EXTERNAL_DBN EXTERNAL_FIXED -#endif -#else -#define EXTERNAL_DBN EXTERNAL_VARIABLE -#endif - #define LOCK_DESC /**/ #define POINTER_INIT() { NULL } #define POINTER_ASSIGN(a) { a } @@ -327,23 +317,11 @@ typedef struct {DB_ADDR *ptr; LOCK_DESC} DB_ADDR_P; #define Pv(t) /**/ #endif -#ifdef ONE_DB -#define NO_DBN -#endif -#ifdef NO_DBN_PARM -#define NO_DBN -#endif -#ifndef NO_DBN #define DBN_D1 Pv(int) #define DBN_FIX_D1 P1(int) #define DBN_Dn Piv(int) -#else -#define DBN_D1 P0 -#define DBN_FIX_D1 /**/ -#define DBN_Dn /**/ -#endif #define TASK_DBN_D1 DBN_D1 #define TASK_D1 P0 -- 2.25.1