From 06f6df327a272eae4d2fed833d7bdb7e81c8de83 Mon Sep 17 00:00:00 2001 From: sailer Date: Mon, 19 May 2003 16:30:48 +0000 Subject: [PATCH] Bugfixes. -- Benjamin Sailer --- allParam/ca/server/paramBlobRecord.cc | 3 ++- allParam/ca/server/paramFilenameRecord.cc | 3 ++- allParam/ca/server/paramIntRecord.cc | 3 ++- allParam/ca/server/paramStringRecord.cc | 3 ++- allParam/ca/server/record.cc | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/allParam/ca/server/paramBlobRecord.cc b/allParam/ca/server/paramBlobRecord.cc index cbeafec..939cf45 100644 --- a/allParam/ca/server/paramBlobRecord.cc +++ b/allParam/ca/server/paramBlobRecord.cc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramBlobRecord.cc,v 1.14 2003-05-19 11:01:55 sailer Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramBlobRecord.cc,v 1.15 2003-05-19 16:30:48 sailer Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -47,6 +47,7 @@ ParamBlobRecord::ParamBlobRecord(caServer& cas, const Param *p, const char *rn, funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh); funcTable.installReadFunc("controlLow", &Record::readControlLow); funcTable.installReadFunc("controlHigh", &Record::readControlHigh); + funcTable.installReadFunc("enums", &Record::readEnums); funcTable.installReadFunc("precision", &Record::readPrecision); funcTable.installReadFunc("value", &ParamBlobRecord::readValue); diff --git a/allParam/ca/server/paramFilenameRecord.cc b/allParam/ca/server/paramFilenameRecord.cc index eddc5b1..db9439f 100644 --- a/allParam/ca/server/paramFilenameRecord.cc +++ b/allParam/ca/server/paramFilenameRecord.cc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramFilenameRecord.cc,v 1.10 2003-05-19 11:01:55 sailer Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramFilenameRecord.cc,v 1.11 2003-05-19 16:30:48 sailer Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -46,6 +46,7 @@ ParamFilenameRecord::ParamFilenameRecord(caServer& cas, const Param *p, const ch funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh); funcTable.installReadFunc("controlLow", &Record::readControlLow); funcTable.installReadFunc("controlHigh", &Record::readControlHigh); + funcTable.installReadFunc("enums", &Record::readEnums); funcTable.installReadFunc("precision", &Record::readPrecision); funcTable.installReadFunc("value", &ParamFilenameRecord::readValue); diff --git a/allParam/ca/server/paramIntRecord.cc b/allParam/ca/server/paramIntRecord.cc index 0138b05..1e90842 100644 --- a/allParam/ca/server/paramIntRecord.cc +++ b/allParam/ca/server/paramIntRecord.cc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramIntRecord.cc,v 1.13 2003-05-19 11:01:55 sailer Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramIntRecord.cc,v 1.14 2003-05-19 16:30:48 sailer Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -43,6 +43,7 @@ ParamIntRecord::ParamIntRecord(caServer& cas, const Param *p, const char *rn, co funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh); funcTable.installReadFunc("controlLow", &Record::readControlLow); funcTable.installReadFunc("controlHigh", &Record::readControlHigh); + funcTable.installReadFunc("enums", &Record::readEnums); funcTable.installReadFunc("precision", &Record::readPrecision); funcTable.installReadFunc("value", &ParamIntRecord::readValue); diff --git a/allParam/ca/server/paramStringRecord.cc b/allParam/ca/server/paramStringRecord.cc index 65c2024..68ba149 100644 --- a/allParam/ca/server/paramStringRecord.cc +++ b/allParam/ca/server/paramStringRecord.cc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramStringRecord.cc,v 1.12 2003-05-19 11:01:55 sailer Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramStringRecord.cc,v 1.13 2003-05-19 16:30:48 sailer Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -46,6 +46,7 @@ ParamStringRecord::ParamStringRecord(caServer& cas, const Param *p, const char * funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh); funcTable.installReadFunc("controlLow", &Record::readControlLow); funcTable.installReadFunc("controlHigh", &Record::readControlHigh); + funcTable.installReadFunc("enums", &Record::readEnums); funcTable.installReadFunc("precision", &Record::readPrecision); funcTable.installReadFunc("value", &ParamStringRecord::readValue); diff --git a/allParam/ca/server/record.cc b/allParam/ca/server/record.cc index 366a89c..d7208f7 100644 --- a/allParam/ca/server/record.cc +++ b/allParam/ca/server/record.cc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.5 2003-05-19 11:01:56 sailer Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.6 2003-05-19 16:30:48 sailer Exp $"; #define _POSIX_C_SOURCE 199506L #if HAVE_CONFIG_H @@ -31,7 +31,7 @@ Record::Record(caServer &cas, const Param *p, const char *n, const char *u, aitE alarmStatus = epicsAlarmNone; alarmSeverity = epicsSevNone; - if(sscanf(pPVName, "HAD:P%*c:%[^:]:%[^:]:%[^:]", buf1, buf2, buf3) != 4) { + if(sscanf(pPVName, "HAD:P%*c:%[^:]:%[^:]:%[^:]", buf1, buf2, buf3) != 3) { strcpy(name, buf1); strcpy(idx, buf2); } else { -- 2.43.0