From 3b3261c877a8b66cb68203bbc399dff08b03a751 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 22 May 2020 11:54:47 +0200
Subject: [PATCH] Revert "new error code for empty arrays"

This reverts commit d51b5513fda5ca7c6058990396d315cfff81cbfe.

Conflicts:
	modules/database/src/ioc/db/dbAccess.c
	modules/database/src/ioc/db/dbDbLink.c
---
 modules/database/src/ioc/db/dbAccess.c         | 2 +-
 modules/database/src/ioc/db/dbAccessDefs.h     | 1 -
 modules/database/src/ioc/db/dbDbLink.c         | 2 +-
 modules/database/test/std/rec/linkFilterTest.c | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/database/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c
index 36b307a6c..d7e5d0890 100644
--- a/modules/database/src/ioc/db/dbAccess.c
+++ b/modules/database/src/ioc/db/dbAccess.c
@@ -958,7 +958,7 @@ long dbGet(DBADDR *paddr, short dbrType,
             DBADDR localAddr = *paddr; /* Structure copy */
 
             if (no_elements < 1) {
-                status = S_db_emptyArray;
+                status = S_db_badField;
                 goto done;
             }
 
diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h
index 16bc471fc..5715df35d 100644
--- a/modules/database/src/ioc/db/dbAccessDefs.h
+++ b/modules/database/src/ioc/db/dbAccessDefs.h
@@ -205,7 +205,6 @@ struct dbr_alDouble     {DBRalDouble};
 #define S_db_noMemory   (M_dbAccess|66) /*unable to allocate data structure from pool*/
 #define S_db_notInit    (M_dbAccess|67) /*Not initialized*/
 #define S_db_bufFull    (M_dbAccess|68) /*Buffer full*/
-#define S_db_emptyArray (M_dbAccess|69) /*Array has no elements*/
 
 struct dbEntry;
 
diff --git a/modules/database/src/ioc/db/dbDbLink.c b/modules/database/src/ioc/db/dbDbLink.c
index 88f32d6ca..4cd87374e 100644
--- a/modules/database/src/ioc/db/dbDbLink.c
+++ b/modules/database/src/ioc/db/dbDbLink.c
@@ -223,7 +223,7 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
             return status;
 
         if (pnRequest && *pnRequest <= 0)
-            return S_db_emptyArray;
+            return S_db_badField;
     }
 
     if (!status && precord != dbChannelRecord(chan))
diff --git a/modules/database/test/std/rec/linkFilterTest.c b/modules/database/test/std/rec/linkFilterTest.c
index c400d1aac..870a25cb5 100644
--- a/modules/database/test/std/rec/linkFilterTest.c
+++ b/modules/database/test/std/rec/linkFilterTest.c
@@ -46,9 +46,9 @@ static void expectProcSuccess(const char *rec)
 static void expectProcFailure(const char *rec)
 {
     char fieldname[20];
-    testDiag("expecting failure S_db_emptyArray %#x from %s", S_db_emptyArray, rec);
+    testDiag("expecting failure S_db_badField %#x from %s", S_db_badField, rec);
     sprintf(fieldname, "%s.PROC", rec);
-    testdbPutFieldFail(S_db_emptyArray, fieldname, DBF_LONG, 1);
+    testdbPutFieldFail(S_db_badField, fieldname, DBF_LONG, 1);
     sprintf(fieldname, "%s.SEVR", rec);
     testdbGetFieldEqual(fieldname, DBF_LONG, INVALID_ALARM);
     sprintf(fieldname, "%s.STAT", rec);