From 8576a9507f6d5bb54bf14585d1e2a3ae6c5f1821 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 29 Mar 2001 18:03:12 +0000 Subject: [PATCH] *** empty log message *** --- allParam/ca/server/paramBlobRecord.cc | 4 -- allParam/ca/server/paramIntRecord.cc | 2 +- allParam/ca/server/paramRecordSet.cc | 12 ++++- allParam/ca/server/paramStringRecord.cc | 5 -- allParam/tcl/tclParam.c | 2 +- allParam/test/Makefile | 2 +- allParam/test/suite.c | 71 ------------------------- 7 files changed, 13 insertions(+), 85 deletions(-) delete mode 100644 allParam/test/suite.c diff --git a/allParam/ca/server/paramBlobRecord.cc b/allParam/ca/server/paramBlobRecord.cc index a67c416..04febc3 100644 --- a/allParam/ca/server/paramBlobRecord.cc +++ b/allParam/ca/server/paramBlobRecord.cc @@ -94,10 +94,6 @@ caStatus ParamBlobRecord::scan() } else { aitUint32 *ourValue = new aitUint32[index]; fread(ourValue, sizeof(aitUint32), index, blob); -#if 0 - size_t howmuch = fread(ourValue, sizeof(aitUint32), index, blob); - fprintf(stderr, "Called fread() with size %d\nnmemb %d\nRead %d\n", (int) sizeof(aitUint32), (int) index, (int) howmuch); -#endif fclose(blob); val = new gddAtomic(gddAppType_value, aitEnumString, 1, index); diff --git a/allParam/ca/server/paramIntRecord.cc b/allParam/ca/server/paramIntRecord.cc index 378fff3..84a843d 100644 --- a/allParam/ca/server/paramIntRecord.cc +++ b/allParam/ca/server/paramIntRecord.cc @@ -59,6 +59,7 @@ gddAppFuncTableStatus ParamIntRecord::readValue(gdd &value) { int rows; int retVal; + retVal = Param_getIntArray(param, name, idx, PARAM_MAX_ARRAY_LEN, &rows, ourValue); index = (unsigned int) rows; if((retVal != 0) || (index == 0)) { @@ -86,7 +87,6 @@ gddAppFuncTableStatus ParamIntRecord::readValue(gdd &value) caStatus ParamIntRecord::scan() { caServer *pCAS = this->getCAS(); - int rows; int retVal; ArrayDestructor *pDest = new ArrayDestructor; diff --git a/allParam/ca/server/paramRecordSet.cc b/allParam/ca/server/paramRecordSet.cc index de883a2..ad1e722 100644 --- a/allParam/ca/server/paramRecordSet.cc +++ b/allParam/ca/server/paramRecordSet.cc @@ -27,6 +27,9 @@ ParamRecordSet::~ParamRecordSet() desParam(param[i]); delete param[i]; } + for (int i = 0 ; i < numPv ; i++) { + delete pvs[i]; + } } Param *ParamRecordSet::pParam(const char *setup) @@ -56,7 +59,6 @@ Param *ParamRecordSet::pParam(const char *setup) pvExistReturn ParamRecordSet::pvExistTest(const casCtx &ctx, const char *pPVName) { char *setup; - char type; char buf1[PARAM_MAX_NAME_LEN]; char buf2[PARAM_MAX_NAME_LEN]; char buf3[PARAM_MAX_NAME_LEN]; @@ -72,8 +74,11 @@ pvExistReturn ParamRecordSet::pvExistTest(const casCtx &ctx, const char *pPVName } if(strncmp(pPVName, "HAD:P", strlen("HAD:P")) == 0) { - sscanf(pPVName, "HAD:P%c:%[^:]:%[^:]:%[^:]", &type, buf1, buf2, buf3); + if (sscanf(pPVName, "HAD:P%*c:%[^:]:%[^:]:%[^:]", buf1, buf2, buf3) != 3) { +#if 0 + sscanf(pPVName, "HAD:P%*c:%[^:]:%[^:]:%[^:]", buf1, buf2, buf3); if (strcmp(buf3, "") == 0) { +#endif setup = NULL; } else { setup = buf1; @@ -118,8 +123,11 @@ pvCreateReturn ParamRecordSet::createPV(const casCtx &ctx, const char *pPVName) } if(strncmp(pPVName, "HAD:P", strlen("HAD:P")) == 0) { + if(sscanf(pPVName, "HAD:P%c:%[^:]:%[^:]:%[^:]", &type, buf1, buf2, buf3) != 4) { +#if 0 sscanf(pPVName, "HAD:P%c:%[^:]:%[^:]:%[^:]", &type, buf1, buf2, buf3); if (strcmp(buf3, "") == 0) { +#endif setup = NULL; } else { setup = buf1; diff --git a/allParam/ca/server/paramStringRecord.cc b/allParam/ca/server/paramStringRecord.cc index b5fde08..5d666f0 100644 --- a/allParam/ca/server/paramStringRecord.cc +++ b/allParam/ca/server/paramStringRecord.cc @@ -164,11 +164,6 @@ caStatus ParamStringRecord::write(const casCtx &ctx, gdd &value) aitString stringValue; value.getConvert(stringValue); -#if 0 - char ourScalarValue[PARAM_MAX_VALUE_LEN]; - strcpy(ourScalarValue, (const char *) stringValue); - Param_storeString(param, name, idx, ourScalarValue); -#endif Param_storeString(param, name, idx, (const char *) stringValue); return S_cas_success; diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c index 966db9e..3fce38e 100644 --- a/allParam/tcl/tclParam.c +++ b/allParam/tcl/tclParam.c @@ -147,7 +147,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma } } for (i = 0 ; i < maxrows ; i++) { - strval[i] = malloc(PARAM_MAX_VALUE_LEN * sizeof(char)); + free(strval[i]); } return retVal; } diff --git a/allParam/test/Makefile b/allParam/test/Makefile index d89cde5..863eee8 100644 --- a/allParam/test/Makefile +++ b/allParam/test/Makefile @@ -54,7 +54,7 @@ blobobjs : filenameobjs : cd filename ; $(MAKE) "CFLAGS=-Wall -I../../include" intobjs : - cd int ; $(MAKE) "CFLAGS=-Wall -DVERBOSE -I../../include" + cd int ; $(MAKE) "CFLAGS=-Wall -I../../include" stringobjs : cd string ; $(MAKE) "CFLAGS=-Wall -I../../include" diff --git a/allParam/test/suite.c b/allParam/test/suite.c deleted file mode 100644 index c67a6aa..0000000 --- a/allParam/test/suite.c +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include - -#include - -#include "int/i_lowercase.h" -#include "int/i_no_index.h" -#include "int/i_string_available.h" -#include "int/i_uppercase.h" -#include "int/ia_long_array.h" -#include "int/ia_lowercase.h" -#include "int/ia_no_index.h" -#include "int/ia_short_array.h" -#include "int/ia_string_available.h" -#include "int/ia_uppercase.h" -#include "string/s_array.h" -#include "string/s_int_available.h" -#include "string/s_lowercase.h" -#include "string/s_no_index.h" -#include "string/s_uppercase.h" -#include "string/sa_int_available.h" -#include "string/sa_long_array.h" -#include "string/sa_lowercase.h" -#include "string/sa_no_index.h" -#include "string/sa_scalar.h" -#include "string/sa_short_array.h" -#include "string/sa_uppercase.h" - -int main(int argc, char *argv[]) { - Param *param; - int errors = 0; - - param = malloc(sizeof(Param)); - conParam(param); - - printf("================================================================================\n"); - printf("%s : Starting test ...\n", argv[0]); - printf("================================================================================\n"); - - errors -= i_lowercase("int/i_lowercase", param); - errors -= i_no_index("int/i_no_index", param); - errors -= i_string_available("int/i_string_available", param); - errors -= i_uppercase("int/i_uppercase", param); - errors -= ia_long_array("int/ia_long_array", param); - errors -= ia_lowercase("int/ia_lowercase", param); - errors -= ia_no_index("int/ia_no_index", param); - errors -= ia_short_array("int/ia_short_array", param); - errors -= ia_string_available("int/ia_string_available", param); - errors -= ia_uppercase("int/ia_uppercase", param); - errors -= s_array("string/s_array", param); - errors -= s_int_available("string/s_int_available", param); - errors -= s_lowercase("string/s_lowercase", param); - errors -= s_no_index("string/s_no_index", param); - errors -= s_uppercase("string/s_uppercase", param); - errors -= sa_int_available("string/sa_int_available", param); - errors -= sa_long_array("string/sa_long_array", param); - errors -= sa_lowercase("string/sa_lowercase", param); - errors -= sa_no_index("string/sa_no_index", param); - errors -= sa_scalar("string/sa_scalar", param); - errors -= sa_short_array("string/sa_short_array", param); - errors -= sa_uppercase("string/sa_uppercase", param); - - desParam(param); - free(param); - - printf("================================================================================\n"); - printf("%s : %d errors detected.\n", argv[0], errors); - printf("================================================================================\n"); - return 0; -} - -- 2.43.0