Cosmetic changes to various soft device supports

src/std/dev/devAiSoftRaw.c

@@ -65,7 +65,7 @@ static long readLocked(struct link *pinp, void *dummy)
         prec->tse == epicsTimeEventDeviceTime)
         dbGetTimeStamp(pinp, &prec->time);
 
-    return 0;
+    return status;
 }
 
 static long read_ai(aiRecord *prec)

src/std/dev/devBiSoft.c

@@ -55,13 +55,15 @@ static long init_record(biRecord *prec)
 static long readLocked(struct link *pinp, void *dummy)
 {
     biRecord *prec = (biRecord *) pinp->precord;
+    long status = dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0);
+
+    if (status) return status;
+
+    prec->udf = FALSE;
+    if (dbLinkIsConstant(&prec->tsel) &&
+        prec->tse == epicsTimeEventDeviceTime)
+        dbGetTimeStamp(pinp, &prec->time);
 
-    if (!dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0)) {
-        prec->udf = FALSE;
-        if (dbLinkIsConstant(&prec->tsel) &&
-            prec->tse == epicsTimeEventDeviceTime)
-            dbGetTimeStamp(pinp, &prec->time);
-    }
     return 2;
 }
 

src/std/dev/devBiSoftRaw.c

@@ -48,19 +48,22 @@ epicsExportAddress(dset, devBiSoftRaw);
 static long init_record(biRecord *prec)
 {
     recGblInitConstantLink(&prec->inp, DBF_ULONG, &prec->rval);
+
     return 0;
 }
 
 static long readLocked(struct link *pinp, void *dummy)
 {
     biRecord *prec = (biRecord *) pinp->precord;
+    long status = dbGetLink(pinp, DBR_ULONG, &prec->rval, 0, 0);
 
-    if (!dbGetLink(pinp, DBR_ULONG, &prec->rval, 0, 0) &&
-        dbLinkIsConstant(&prec->tsel) &&
+    if (status) return status;
+
+    if (dbLinkIsConstant(&prec->tsel) &&
         prec->tse == epicsTimeEventDeviceTime)
         dbGetTimeStamp(pinp, &prec->time);
 
-    return 0;
+    return status;
 }
 
 static long read_bi(biRecord *prec)

src/std/dev/devLiSoft.c

@@ -58,10 +58,12 @@ static long readLocked(struct link *pinp, void *dummy)
     longinRecord *prec = (longinRecord *) pinp->precord;
     long status = dbGetLink(pinp, DBR_LONG, &prec->val, 0, 0);
 
-    if (!status &&
-        dbLinkIsConstant(&prec->tsel) &&
+    if (status) return status;
+
+    if (dbLinkIsConstant(&prec->tsel) &&
         prec->tse == epicsTimeEventDeviceTime)
         dbGetTimeStamp(pinp, &prec->time);
+
     return status;
 }
 

src/std/dev/devLsiSoft.c

@@ -29,8 +29,9 @@ static long readLocked(struct link *pinp, void *dummy)
     lsiRecord *prec = (lsiRecord *) pinp->precord;
     long status = dbGetLinkLS(pinp, prec->val, prec->sizv, &prec->len);
 
-    if (!status &&
-        dbLinkIsConstant(&prec->tsel) &&
+    if (status) return status;
+
+    if (dbLinkIsConstant(&prec->tsel) &&
         prec->tse == epicsTimeEventDeviceTime)
         dbGetTimeStamp(pinp, &prec->time);
 

src/std/dev/devMbbiDirectSoft.c

@@ -56,13 +56,15 @@ static long init_record(mbbiDirectRecord *prec)
 static long readLocked(struct link *pinp, void *dummy)
 {
     mbbiDirectRecord *prec = (mbbiDirectRecord *) pinp->precord;
+    long status = dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0);
+
+    if (status) return status;
+
+    prec->udf = FALSE;
+    if (dbLinkIsConstant(&prec->tsel) &&
+        prec->tse == epicsTimeEventDeviceTime)
+        dbGetTimeStamp(pinp, &prec->time);
 
-    if (!dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0)) {
-        prec->udf = FALSE;
-        if (dbLinkIsConstant(&prec->tsel) &&
-            prec->tse == epicsTimeEventDeviceTime)
-            dbGetTimeStamp(pinp, &prec->time);
-    }
     return 2;
 }
 

src/std/dev/devMbbiSoft.c

@@ -56,14 +56,15 @@ static long init_record(mbbiRecord *prec)
 static long readLocked(struct link *pinp, void *dummy)
 {
     mbbiRecord *prec = (mbbiRecord *) pinp->precord;
+    long status = dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0);
 
-    if (!dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0)) {
-        prec->udf = FALSE;
+    if (status) return status;
+
+    prec->udf = FALSE;
+    if (dbLinkIsConstant(&prec->tsel) &&
+        prec->tse == epicsTimeEventDeviceTime)
+        dbGetTimeStamp(pinp, &prec->time);
 
-        if (dbLinkIsConstant(&prec->tsel) &&
-            prec->tse == epicsTimeEventDeviceTime)
-            dbGetTimeStamp(pinp, &prec->time);
-    }
     return 2;
 }