drop display.format

mdavidsaver · Feb 20, 2019 · 5b14bbe · 5b14bbe
1 parent 37cb765
commit 5b14bbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -2204,7 +2204,6 @@ class MockChannel :
                 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")