From 8f5be5f0ad1b6cb27c23a2a0152f6e647ce1f835 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Tue, 25 Feb 2020 11:34:57 +0100
Subject: [PATCH] removed unnecessary recGblSetSevr call

---
 modules/database/src/ioc/db/dbDbLink.c | 35 ++++++++++----------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/modules/database/src/ioc/db/dbDbLink.c b/modules/database/src/ioc/db/dbDbLink.c
index c48716b4b..b1548bd16 100644
--- a/modules/database/src/ioc/db/dbDbLink.c
+++ b/modules/database/src/ioc/db/dbDbLink.c
@@ -183,28 +183,19 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
         db_field_log *pfl;
 
         /* For the moment, empty arrays are not supported by EPICS */
-        if (dbChannelFinalElements(chan) <= 0)
-        {
-            /* empty array request */
-            status = S_db_badField;
-        } else {
-            pfl = db_create_read_log(chan);
-            if (!pfl) {
-                status = S_db_noMemory;
-            } else {
-                pfl = dbChannelRunPreChain(chan, pfl);
-                pfl = dbChannelRunPostChain(chan, pfl);
-                status = dbChannelGet(chan, dbrType, pbuffer, NULL, pnRequest, pfl);
-                db_delete_field_log(pfl);
-                if (!status && pnRequest && *pnRequest <= 0) {
-                    /* empty array result */
-                    status = S_db_badField;
-                }
-            }
-        }
-        if (status) {
-            recGblSetSevr(precord, LINK_ALARM, UDF_ALARM);
-        }
+        if (dbChannelFinalElements(chan) <= 0) /* empty array request */
+            return S_db_badField;
+        pfl = db_create_read_log(chan);
+        if (!pfl)
+            return S_db_noMemory;
+        pfl = dbChannelRunPreChain(chan, pfl);
+        pfl = dbChannelRunPostChain(chan, pfl);
+        status = dbChannelGet(chan, dbrType, pbuffer, NULL, pnRequest, pfl);
+        db_delete_field_log(pfl);
+        if (status)
+            return status;
+        if (pnRequest && *pnRequest <= 0) /* empty array result */
+            return S_db_badField;
     } else if (ppv_link->getCvt && ppv_link->lastGetdbrType == dbrType) {
         status = ppv_link->getCvt(dbChannelField(chan), pbuffer, paddr);
     } else {