epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ts filter: port to the new db_field_log

Browse Source
This commit is contained in:
Jure Varlec
2022-10-18 17:05:05 +02:00
committed by Michael Davidsaver
parent 8a3020033e
commit e11f88017d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/std/filters/ts.c
+10 -10
View File
@@ -167,9 +167,9 @@ static db_field_log *replace_fl_value(tsPrivate const *pvt,
int (*func)(tsPrivate const *,
db_field_log *)) {
/* Get rid of the old value */
if (pfl->type == dbfl_type_ref && pfl->u.r.dtor) {
pfl->u.r.dtor(pfl);
pfl->u.r.dtor = NULL;
if (pfl->type == dbfl_type_ref && pfl->dtor) {
pfl->dtor(pfl);
pfl->dtor = NULL;
}
pfl->no_elements = 1;
pfl->type = dbfl_type_val;
@@ -228,11 +228,11 @@ static int ts_array(tsPrivate const *settings, db_field_log *pfl) {
pfl->u.r.field = allocTsArray();
if (pfl->u.r.field) {
pfl->no_elements = 2;
pfl->u.r.dtor = freeTsArray;
pfl->dtor = freeTsArray;
ts_to_array(settings, &pfl->time, (epicsUInt32*)pfl->u.r.field);
} else {
pfl->no_elements = 0;
pfl->u.r.dtor = NULL;
pfl->dtor = NULL;
}
return 0;
}
@@ -263,11 +263,11 @@ static int ts_string(tsPrivate const *settings, db_field_log *pfl) {
if (!pfl->u.r.field) {
pfl->no_elements = 0;
pfl->u.r.dtor = NULL;
pfl->dtor = NULL;
return 0;
}
pfl->u.r.dtor = freeString;
pfl->dtor = freeString;
field = (char *)pfl->u.r.field;
n = epicsTimeToStrftime(field, MAX_STRING_SIZE, fmt, &pfl->time);
@@ -336,9 +336,9 @@ static void channelRegisterPost(dbChannel *chan, void *pvt,
/* Get rid of the value of the probe because we will be changing the
datatype */
if (probe->type == dbfl_type_ref && probe->u.r.dtor) {
probe->u.r.dtor(probe);
probe->u.r.dtor = NULL;
if (probe->type == dbfl_type_ref && probe->dtor) {
probe->dtor(probe);
probe->dtor = NULL;
}
probe->no_elements = 1;
probe->type = dbfl_type_val;