From 54cc4cec31adca05477d9cc44a97a1d7c5b7ef99 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 6 Aug 2003 18:11:57 +0000 Subject: [PATCH] A bug in dbGetLink resulted in nRequest not being given the value 0 if the link is a constant link. This in turn caused the waveform record to always set NORD=NELEM. --- src/db/dbAccess.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h index 8e47c0701..bb9045a91 100644 --- a/src/db/dbAccess.h +++ b/src/db/dbAccess.h @@ -191,14 +191,12 @@ struct dbr_alDouble {DBRalDouble}; /* Global Database Access Routines*/ #define dbGetLink(PLNK,DBRTYPE,PBUFFER,OPTIONS,NREQUEST) \ - (((((PLNK)->type == CONSTANT)&&(!(NREQUEST))) ||\ - (! (((PLNK)->type == DB_LINK) || ((PLNK)->type == CA_LINK)) ))\ - ? 0\ - : dbGetLinkValue((PLNK),(DBRTYPE), \ - (void *)(PBUFFER),(OPTIONS),(NREQUEST))) + ((((PLNK)->type == CONSTANT) && (!(NREQUEST) &&(!OPTIONS))) \ + ? 0\ + : dbGetLinkValue((PLNK),(DBRTYPE), \ + (void *)(PBUFFER),(OPTIONS),(NREQUEST))) #define dbPutLink(PLNK,DBRTYPE,PBUFFER,NREQUEST) \ - ((((PLNK)->type == CONSTANT) ||\ - (! (((PLNK)->type == DB_LINK) || ((PLNK)->type == CA_LINK)) ))\ + (((PLNK)->type == CONSTANT) \ ? 0\ : dbPutLinkValue((PLNK),(DBRTYPE),(void *)(PBUFFER),(NREQUEST))) #define dbGetPdbAddrFromLink(PLNK) \