quiet warnings

aderbenev · Aug 15, 2017 · 5723e03 · 5723e03
1 parent 9d7c46f
commit 5723e03
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/evgMrmApp/src/devSupport/devEvgDbus.cpp b/evgMrmApp/src/devSupport/devEvgDbus.cpp
@@ -73,6 +73,7 @@ common_dset devBoEvgDbusSrcInp = {
     (DEVSUPFUN)init_bo_src_inp,
     NULL,
     (DEVSUPFUN)write_bo_src_inp,
+    NULL,
 };
 epicsExportAddress(dset, devBoEvgDbusSrcInp);
 

diff --git a/evgMrmApp/src/devSupport/devEvgTrigEvt.cpp b/evgMrmApp/src/devSupport/devEvgTrigEvt.cpp
@@ -118,6 +118,7 @@ common_dset devBoEvgTrigEvtMxc = {
     (DEVSUPFUN)init_bo_trigSrc,
     NULL,
     (DEVSUPFUN)write_bo_trigSrc_mxc,
+    NULL,
 };
 epicsExportAddress(dset, devBoEvgTrigEvtMxc);
 
@@ -128,6 +129,7 @@ common_dset devBoEvgTrigEvtAc = {
     (DEVSUPFUN)init_bo_trigSrc,
     NULL,
     (DEVSUPFUN)write_bo_trigSrc_ac,
+    NULL,
 };
 epicsExportAddress(dset, devBoEvgTrigEvtAc);
 
@@ -138,6 +140,7 @@ common_dset devBoEvgTrigEvtInp = {
     (DEVSUPFUN)init_bo_trigSrc,
     NULL,
     (DEVSUPFUN)write_bo_trigSrc_inp,
+    NULL,
 };
 epicsExportAddress(dset, devBoEvgTrigEvtInp);
 

diff --git a/evrApp/src/devEvrMapping.cpp b/evrApp/src/devEvrMapping.cpp
@@ -185,7 +185,8 @@ common_dset devLOEVRMap = {
     dset_cast(&init_dset<&dxtLOEVRMap>),
     (DEVSUPFUN) init_record_empty,
     NULL,
-    (DEVSUPFUN) write_lo
+    (DEVSUPFUN) write_lo,
+    NULL
 };
 epicsExportAddress(dset,devLOEVRMap);
 

diff --git a/evrApp/src/devEvrPulserMapping.cpp b/evrApp/src/devEvrPulserMapping.cpp
@@ -173,7 +173,8 @@ common_dset devLOEVRPulserMap = {
     dset_cast(&init_dset<&dxtLOEVRPulserMap>),
     (DEVSUPFUN) &init_record_empty,
     NULL,
-    (DEVSUPFUN) &write_lo
+    (DEVSUPFUN) &write_lo,
+    NULL
 };
 epicsExportAddress(dset,devLOEVRPulserMap);
 

diff --git a/evrApp/src/devEvrStringIO.cpp b/evrApp/src/devEvrStringIO.cpp
@@ -133,7 +133,8 @@ common_dset devSIEVR = {
     dset_cast(&init_dset<&dxtSIEVR>),
     (DEVSUPFUN) init_record_empty,
     NULL,
-    (DEVSUPFUN) read_si
+    (DEVSUPFUN) read_si,
+    NULL
 };
 epicsExportAddress(dset,devSIEVR);
 

diff --git a/mrfCommon/src/devlutstring.cpp b/mrfCommon/src/devlutstring.cpp
@@ -172,7 +172,8 @@ common_dset devLUTSI = {
     0,
     (DEVSUPFUN)&init_record_lut,
     0,
-    (DEVSUPFUN)&read_lut
+    (DEVSUPFUN)&read_lut,
+    0
 };
 
 } // namespace

diff --git a/mrfCommon/src/linkoptions.h b/mrfCommon/src/linkoptions.h
@@ -108,7 +108,7 @@ typedef struct linkOptionDef {
 #define linkEnum(Struct, Member, Name, Req, Over, Enums) \
 {Name, linkOptionEnum, Req, Over, OFFSET(Struct, Member), sizeof( ((Struct*)0)->Member ), Enums}
 
-#define linkOptionEnd {0}
+#define linkOptionEnd {0,linkOptionInvalid,0,0,0,0,NULL}
 
 /* Extra output when parsing and converting */
 #define LINKOPTIONDEBUG 1

diff --git a/mrmShared/src/mrmDataBufTx.cpp b/mrmShared/src/mrmDataBufTx.cpp
@@ -116,5 +116,5 @@ mrmDataBufTx::dataSend(epicsUInt32 len,
     // Reading flushes output queue of VME bridge
     // Actual sending is so fast that we can use busy wait here
     // Measurements showed that we loop up to 17 times
-    while(!(nat_ioread32(dataCtrl)&DataTxCtrl_done));
+    while(!(nat_ioread32(dataCtrl)&DataTxCtrl_done)) {};
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ common_dset devBoEvgDbusSrcInp = { @@
         (DEVSUPFUN)init_bo_src_inp,
         NULL,
         (DEVSUPFUN)write_bo_src_inp,
+        NULL,
     };
     epicsExportAddress(dset, devBoEvgDbusSrcInp);
@@ Expand Down @@