From 5b14bbef5aeec0dfbce26e48542a6b3469ee4d13 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 13 Feb 2019 21:06:49 -0800
Subject: [PATCH] drop display.format

---
 src/ca/dbdToPv.cpp            | 6 ++++--
 testApp/remote/testServer.cpp | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ca/dbdToPv.cpp b/src/ca/dbdToPv.cpp
index 254ba7f..a6b4229 100644
--- a/src/ca/dbdToPv.cpp
+++ b/src/ca/dbdToPv.cpp
@@ -718,8 +718,10 @@ Status DbdToPv::getFromDBD(
          if(caDisplay.format!=format) {
             caDisplay.format = format;
             PVStringPtr pvString = pvDisplay->getSubField<PVString>("format");
-            pvString->put(format);
-            bitSet->set(pvString->getFieldOffset());
+            if(pvString) {
+                pvString->put(format);
+                bitSet->set(pvString->getFieldOffset());
+            }
          }
     }
     if(valueAlarmRequested) {
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index 8c12916..1ee958f 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -2204,7 +2204,6 @@ protected:
                 displayStructure->getSubField<PVDouble>("limitLow")->put(-1.0);
                 displayStructure->getSubField<PVDouble>("limitHigh")->put(1.0);
                 displayStructure->getSubField<PVString>("description")->put("Simulated ADC");
-                displayStructure->getSubField<PVString>("format")->put("%f");
                 displayStructure->getSubField<PVString>("units")->put("V");
             }
             else if (m_name.find("testRPC") == 0 || m_name == "testNTTable" || m_name == "testNTMatrix")