From e43fb954ce2a8c50cd2d53ca66c8ebd89e42d29f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 30 Nov 2017 17:02:15 -0600
Subject: [PATCH] Remove poptions arg from dbTryGetLink()

---
 src/ioc/db/dbLink.c | 14 +++++++-------
 src/ioc/db/dbLink.h |  2 +-
 src/ioc/db/recGbl.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ioc/db/dbLink.c b/src/ioc/db/dbLink.c
index d3e73267d..7b4e7addd 100644
--- a/src/ioc/db/dbLink.c
+++ b/src/ioc/db/dbLink.c
@@ -292,15 +292,10 @@ long dbGetNelements(const struct link *plink, long *nelements)
 }
 
 long dbTryGetLink(struct link *plink, short dbrType, void *pbuffer,
-                  long *poptions, long *pnRequest)
+        long *pnRequest)
 {
     lset *plset = plink->lset;
 
-    if (poptions && *poptions) {
-        printf("dbTryGetLink: Use of poptions no longer supported\n");
-        *poptions = 0;
-    }
-
     if (!plset || !plset->getValue)
         return -1;
 
@@ -313,7 +308,12 @@ long dbGetLink(struct link *plink, short dbrType, void *pbuffer,
     struct dbCommon *precord = plink->precord;
     long status;
 
-    status = dbTryGetLink(plink, dbrType, pbuffer, poptions, pnRequest);
+    if (poptions && *poptions) {
+        printf("dbGetLink: Use of poptions no longer supported\n");
+        *poptions = 0;
+    }
+
+    status = dbTryGetLink(plink, dbrType, pbuffer, pnRequest);
     if (status)
         recGblSetSevr(precord, LINK_ALARM, INVALID_ALARM);
     return status;
diff --git a/src/ioc/db/dbLink.h b/src/ioc/db/dbLink.h
index 006def2a0..fcfadb24f 100644
--- a/src/ioc/db/dbLink.h
+++ b/src/ioc/db/dbLink.h
@@ -101,7 +101,7 @@ epicsShareFunc long dbGetNelements(const struct link *plink, long *nelements);
 epicsShareFunc int dbIsLinkConnected(const struct link *plink); /* 0 or 1 */
 epicsShareFunc int dbGetLinkDBFtype(const struct link *plink);
 epicsShareFunc long dbTryGetLink(struct link *, short dbrType, void *pbuffer,
-        long *options, long *nRequest);
+        long *nRequest);
 epicsShareFunc long dbGetLink(struct link *, short dbrType, void *pbuffer,
         long *options, long *nRequest);
 epicsShareFunc long dbGetControlLimits(const struct link *plink, double *low,
diff --git a/src/ioc/db/recGbl.c b/src/ioc/db/recGbl.c
index 0e44d986b..12c0a0e0f 100644
--- a/src/ioc/db/recGbl.c
+++ b/src/ioc/db/recGbl.c
@@ -403,7 +403,7 @@ long recGblGetSimm(struct dbCommon *pcommon, epicsEnum16 *psscn,
     long status;
 
     recGblSaveSimm(*psscn, poldsimm, *psimm);
-    status = dbTryGetLink(psiml, DBR_USHORT, psimm, 0, 0);
+    status = dbTryGetLink(psiml, DBR_USHORT, psimm, 0);
     if (status && !pcommon->nsev) pcommon->nsta = LINK_ALARM;
     recGblCheckSimm(pcommon, psscn, *poldsimm, *psimm);
     return 0;